diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-07-07 15:18:01 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-07-09 15:50:11 +0200 |
| commit | b47ec2c4562117728be36ec2edfbdf9ef2868c6e (patch) | |
| tree | b71492ca8498641b0aff368aacf25ad309ae8e2e | |
| parent | 01fb2705bd19a6e9c1207446793064dbd141df5f (diff) | |
| download | focaccia-qemu-b47ec2c4562117728be36ec2edfbdf9ef2868c6e.tar.gz focaccia-qemu-b47ec2c4562117728be36ec2edfbdf9ef2868c6e.zip | |
block: prefer aio_poll to qemu_aio_wait
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 2 | ||||
| -rw-r--r-- | blockjob.c | 2 | ||||
| -rw-r--r-- | qemu-io-cmds.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/block.c b/block.c index c9629a44b9..510430de35 100644 --- a/block.c +++ b/block.c @@ -471,7 +471,7 @@ int bdrv_create(BlockDriver *drv, const char* filename, co = qemu_coroutine_create(bdrv_create_co_entry); qemu_coroutine_enter(co, &cco); while (cco.ret == NOT_DONE) { - qemu_aio_wait(); + aio_poll(qemu_get_aio_context(), true); } } diff --git a/blockjob.c b/blockjob.c index 67a64ea318..ca0b4e25d0 100644 --- a/blockjob.c +++ b/blockjob.c @@ -187,7 +187,7 @@ int block_job_cancel_sync(BlockJob *job) job->opaque = &data; block_job_cancel(job); while (data.ret == -EINPROGRESS) { - qemu_aio_wait(); + aio_poll(bdrv_get_aio_context(bs), true); } return (data.cancelled && data.ret == 0) ? -ECANCELED : data.ret; } 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; |