Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: 0127b79e8b9f91c69885e8d425648c16f3bb12ec https://github.com/qemu/qemu/commit/0127b79e8b9f91c69885e8d425648c16f3bb12ec Author: Daniel P. Berrange <berra...@redhat.com> Date: 2017-09-05 (Tue, 05 Sep 2017)
Changed paths: M tests/qemu-iotests/192 Log Message: ----------- iotests: rewrite 192 to use _launch_qemu to fix LUKS support The LUKS driver requires extra args to QEMU to setup passwords. The _launch_qemu function takes care of this, so convert the test to use this function and use correct -drive syntax Signed-off-by: Daniel P. Berrange <berra...@redhat.com> Message-Id: <20170901105434.3288-2-berra...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Tested-by: Fam Zheng <f...@redhat.com> Signed-off-by: Eric Blake <ebl...@redhat.com> Commit: 3f5c4076f118072ac7403ca092d63a1766cd5e04 https://github.com/qemu/qemu/commit/3f5c4076f118072ac7403ca092d63a1766cd5e04 Author: Daniel P. Berrange <berra...@redhat.com> Date: 2017-09-05 (Tue, 05 Sep 2017) Changed paths: M tests/qemu-iotests/194 M tests/qemu-iotests/iotests.py Log Message: ----------- iotests: blacklist 194 with the luks driver The 194 test has a lot of code that assumes a simple image file. Rewriting this to work with luks is possible, but non-trivial, so blacklist the luks format for now. Signed-off-by: Daniel P. Berrange <berra...@redhat.com> Message-Id: <20170901105434.3288-3-berra...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Tested-by: Fam Zheng <f...@redhat.com> [eblake: commit message typo fixed] Reviewed-by: Kashyap Chamarthy <kcham...@redhat.com> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Signed-off-by: Eric Blake <ebl...@redhat.com> Commit: 9ffb8270205a274a18ee4f8a735e2fccaf957246 https://github.com/qemu/qemu/commit/9ffb8270205a274a18ee4f8a735e2fccaf957246 Author: Eric Blake <ebl...@redhat.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M io/channel.c Log Message: ----------- io: Yield rather than wait when already in coroutine The new qio_channel_{read,write}{,v}_all functions are documented as yielding until data is available. When used on a blocking channel, this yield is done via qio_channel_wait() which spawns a nested event loop under the hood (so it is that secondary loop which yields as needed); but if we are already in a coroutine (at which point QIO_CHANNEL_ERR_BLOCK is only possible if we are a non-blocking channel), we want to yield the current coroutine instead of spawning a nested event loop. Signed-off-by: Eric Blake <ebl...@redhat.com> Message-Id: <20170905191114.5959-2-ebl...@redhat.com> Acked-by: Daniel P. Berrange <berra...@redhat.com> [commit message updated] Signed-off-by: Eric Blake <ebl...@redhat.com> Commit: e8ffaa311080a570a7c86d03c139c160cd11a831 https://github.com/qemu/qemu/commit/e8ffaa311080a570a7c86d03c139c160cd11a831 Author: Eric Blake <ebl...@redhat.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M include/io/channel.h M io/channel.c Log Message: ----------- io: Add new qio_channel_read{, v}_all_eof functions Some callers want to distinguish between clean EOF (no bytes read) vs. a short read (at least one byte read, but EOF encountered before reaching the desired length), as it allows clients the ability to do a graceful shutdown when a server shuts down at defined safe points in the protocol, rather than treating all shutdown scenarios as an error due to EOF. However, we don't want to require all callers to have to check for early EOF. So add another wrapper function that can be used by the callers that care about the distinction. Signed-off-by: Eric Blake <ebl...@redhat.com> Message-Id: <20170905191114.5959-3-ebl...@redhat.com> Acked-by: Daniel P. Berrange <berra...@redhat.com> Commit: 030fa7f6f950f5c8963f1dee8e6bb7387ed86a99 https://github.com/qemu/qemu/commit/030fa7f6f950f5c8963f1dee8e6bb7387ed86a99 Author: Eric Blake <ebl...@redhat.com> Date: 2017-09-06 (Wed, 06 Sep 2017) Changed paths: M block/nbd-client.c M include/block/nbd.h M nbd/common.c M nbd/nbd-internal.h M tests/qemu-iotests/083.out Log Message: ----------- nbd: Use new qio_channel_*_all() functions Rather than open-coding our own read/write-all functions, we can make use of the recently-added qio code. It slightly changes the error message in one of the iotests. Signed-off-by: Eric Blake <ebl...@redhat.com> Message-Id: <20170905191114.5959-4-ebl...@redhat.com> Reviewed-by: Daniel P. Berrange <berra...@redhat.com> Commit: 75be9a52b147790decd62e43d279a5f3dfc95b5c https://github.com/qemu/qemu/commit/75be9a52b147790decd62e43d279a5f3dfc95b5c Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2017-09-07 (Thu, 07 Sep 2017) Changed paths: M block/nbd-client.c M include/block/nbd.h M include/io/channel.h M io/channel.c M nbd/common.c M nbd/nbd-internal.h M tests/qemu-iotests/083.out M tests/qemu-iotests/192 M tests/qemu-iotests/194 M tests/qemu-iotests/iotests.py Log Message: ----------- 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 <ebl...@redhat.com>" # gpg: aka "Eric Blake (Free Software Programmer) <e...@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.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/ef475b5dd126...75be9a52b147