diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-07 17:53:59 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-07 17:53:59 +0100 |
commit | 75be9a52b147790decd62e43d279a5f3dfc95b5c (patch) | |
tree | 066cf2dbca492a4d64fbc04169777a1486a13429 /tests/qemu-iotests/083.out | |
parent | ef475b5dd12684591e6264e517eaa5b3e90f7ffa (diff) | |
parent | 030fa7f6f950f5c8963f1dee8e6bb7387ed86a99 (diff) |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-09-06' into staging
nbd patches for 2017-09-06
- Daniel P. Berrange: [0/2] Fix / skip recent iotests with LUKS driver
- Eric Blake: [0/3] nbd: Use common read/write-all qio functions
# gpg: Signature made Wed 06 Sep 2017 16:17:55 BST
# 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-09-06:
nbd: Use new qio_channel_*_all() functions
io: Add new qio_channel_read{, v}_all_eof functions
io: Yield rather than wait when already in coroutine
iotests: blacklist 194 with the luks driver
iotests: rewrite 192 to use _launch_qemu to fix LUKS support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/083.out')
-rw-r--r-- | tests/qemu-iotests/083.out | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out index fb71b6f8ad..25dde519e3 100644 --- a/tests/qemu-iotests/083.out +++ b/tests/qemu-iotests/083.out @@ -69,12 +69,12 @@ read failed: Input/output error === Check disconnect 4 reply === -End of file +Unexpected end-of-file before all bytes were read read failed: Input/output error === Check disconnect 8 reply === -End of file +Unexpected end-of-file before all bytes were read read failed: Input/output error === Check disconnect before data === @@ -180,12 +180,12 @@ read failed: Input/output error === Check disconnect 4 reply === -End of file +Unexpected end-of-file before all bytes were read read failed: Input/output error === Check disconnect 8 reply === -End of file +Unexpected end-of-file before all bytes were read read failed: Input/output error === Check disconnect before data === |