diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-14 13:09:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-14 13:09:29 +0100 |
| commit | 7a6d04e73fdd571234e05dcad96895fafb3f22f0 (patch) | |
| tree | acf7065c975ca4056f3041c58907803239b9941e /qemu-io-cmds.c | |
| parent | c15a34eda0f270888a0e4676997317e1bd7894b8 (diff) | |
| parent | 58ac321135af890b503ebe56d0d00e184779918f (diff) | |
| download | focaccia-qemu-7a6d04e73fdd571234e05dcad96895fafb3f22f0.tar.gz focaccia-qemu-7a6d04e73fdd571234e05dcad96895fafb3f22f0.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.1.0-rc2 (v2) # gpg: Signature made Mon 14 Jul 2014 11:04:12 BST using RSA key ID C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" * remotes/kevin/tags/for-upstream: (22 commits) ide: Treat read/write beyond end as invalid virtio-blk: Treat read/write beyond end as invalid virtio-blk: Bypass error action and I/O accounting on invalid r/w virtio-blk: Factor common checks out of virtio_blk_handle_read/write() dma-helpers: Fix too long qiov qtest: fix vhost-user-test compilation with old GLib tests: Fix unterminated string output visitor enum human string AioContext: do not rely on aio_poll(ctx, true) result to end a loop virtio-blk: embed VirtQueueElement in VirtIOBlockReq virtio-blk: avoid g_slice_new0() for VirtIOBlockReq and VirtQueueElement dataplane: do not free VirtQueueElement in vring_push() virtio-blk: avoid dataplane VirtIOBlockReq early free block: Assert qiov length matches request length qed: Make qiov match request size until backing file EOF qcow2: Make qiov match request size until backing file EOF block: Make qiov match the request size until EOF AioContext: speed up aio_notify test-aio: fix GSource-based timer test block: drop aio functions that operate on the main AioContext block: prefer aio_poll to qemu_aio_wait ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-io-cmds.c')
| -rw-r--r-- | qemu-io-cmds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 60c1cebffc..c503fc66aa 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -483,7 +483,7 @@ static int do_co_write_zeroes(BlockDriverState *bs, int64_t offset, int count, co = qemu_coroutine_create(co_write_zeroes_entry); qemu_coroutine_enter(co, &data); while (!data.done) { - qemu_aio_wait(); + aio_poll(bdrv_get_aio_context(bs), true); } if (data.ret < 0) { return data.ret; @@ -2027,7 +2027,7 @@ static const cmdinfo_t resume_cmd = { static int wait_break_f(BlockDriverState *bs, int argc, char **argv) { while (!bdrv_debug_is_suspended(bs, argv[1])) { - qemu_aio_wait(); + aio_poll(bdrv_get_aio_context(bs), true); } return 0; |