aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-10-31 13:12:21 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-10-31 13:12:21 +0000
commit92c7ec5cd4d15c76218703f7bd3ca75bd46353b7 (patch)
tree0e17111be31efbc5ab657c4736b3e8556b4cf191 /tests
parentd2b9d71432687eef947f243a57409381151701d5 (diff)
parentf140e3000371e67ff4e00df3213e2d576d9c91be (diff)
downloadqemu-92c7ec5cd4d15c76218703f7bd3ca75bd46353b7.zip
qemu-92c7ec5cd4d15c76218703f7bd3ca75bd46353b7.tar.gz
qemu-92c7ec5cd4d15c76218703f7bd3ca75bd46353b7.tar.bz2
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-10-30' into staging
nbd patches for 2017-10-30 Vladimir Sementsov-Ogievskiy (some patches co-authored by Eric Blake): 00/12 nbd minimal structured read # gpg: Signature made Mon 30 Oct 2017 20:54:54 GMT # gpg: using RSA key 0xA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" # gpg: aka "[jpeg image of size 6874]" # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2017-10-30: nbd: Minimal structured read for client nbd: Move nbd_read() to common header nbd/client: prepare nbd_receive_reply for structured reply nbd/client: refactor nbd_receive_starttls nbd/server: Include human-readable message in structured errors nbd: Minimal structured read for server nbd/server: Refactor zero-length option check nbd/server: Simplify nbd_negotiate_options loop nbd/server: Report error for write to read-only export nbd: Expose constants and structs for structured read nbd: Move nbd_errno_to_system_errno() to public header nbd: Include error names in trace messages Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/qemu-iotests/083.out15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out
index 25dde51..be6079d 100644
--- a/tests/qemu-iotests/083.out
+++ b/tests/qemu-iotests/083.out
@@ -41,6 +41,7 @@ can't open device nbd+tcp://127.0.0.1:PORT/foo
=== Check disconnect after neg2 ===
+Connection closed
read failed: Input/output error
=== Check disconnect 8 neg2 ===
@@ -53,32 +54,39 @@ can't open device nbd+tcp://127.0.0.1:PORT/foo
=== Check disconnect before request ===
+Connection closed
read failed: Input/output error
=== Check disconnect after request ===
+Connection closed
read failed: Input/output error
=== Check disconnect before reply ===
+Connection closed
read failed: Input/output error
=== Check disconnect after reply ===
+Unexpected end-of-file before all bytes were read
read failed: Input/output error
=== Check disconnect 4 reply ===
Unexpected end-of-file before all bytes were read
+Connection closed
read failed: Input/output error
=== Check disconnect 8 reply ===
Unexpected end-of-file before all bytes were read
+Connection closed
read failed: Input/output error
=== Check disconnect before data ===
+Unexpected end-of-file before all bytes were read
read failed: Input/output error
=== Check disconnect after data ===
@@ -108,6 +116,7 @@ can't open device nbd+tcp://127.0.0.1:PORT/
=== Check disconnect after neg-classic ===
+Connection closed
read failed: Input/output error
=== Check disconnect before neg1 ===
@@ -168,28 +177,34 @@ read failed: Input/output error
=== Check disconnect after request ===
+Connection closed
read failed: Input/output error
=== Check disconnect before reply ===
+Connection closed
read failed: Input/output error
=== Check disconnect after reply ===
+Unexpected end-of-file before all bytes were read
read failed: Input/output error
=== Check disconnect 4 reply ===
Unexpected end-of-file before all bytes were read
+Connection closed
read failed: Input/output error
=== Check disconnect 8 reply ===
Unexpected end-of-file before all bytes were read
+Connection closed
read failed: Input/output error
=== Check disconnect before data ===
+Unexpected end-of-file before all bytes were read
read failed: Input/output error
=== Check disconnect after data ===