mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: prefer aio_poll to qemu_aio_wait

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-07-07 15:18:01 +02:00 committed by Kevin Wolf
parent 01fb2705bd
commit b47ec2c456
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block.c
View File

@ -471,7 +471,7 @@ int bdrv_create(BlockDriver *drv, const char* filename,
co = qemu_coroutine_create(bdrv_create_co_entry); co = qemu_coroutine_create(bdrv_create_co_entry);
qemu_coroutine_enter(co, &cco); qemu_coroutine_enter(co, &cco);
while (cco.ret == NOT_DONE) { while (cco.ret == NOT_DONE) {
qemu_aio_wait(); aio_poll(qemu_get_aio_context(), true);
} }
} }

2
blockjob.c
View File

@ -187,7 +187,7 @@ int block_job_cancel_sync(BlockJob *job)
job->opaque = &data; job->opaque = &data;
block_job_cancel(job); block_job_cancel(job);
while (data.ret == -EINPROGRESS) { while (data.ret == -EINPROGRESS) {
qemu_aio_wait(); aio_poll(bdrv_get_aio_context(bs), true);
} }
return (data.cancelled && data.ret == 0) ? -ECANCELED : data.ret; return (data.cancelled && data.ret == 0) ? -ECANCELED : data.ret;
} }

4
qemu-io-cmds.c
View File

@ -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); co = qemu_coroutine_create(co_write_zeroes_entry);
qemu_coroutine_enter(co, &data); qemu_coroutine_enter(co, &data);
while (!data.done) { while (!data.done) {
qemu_aio_wait(); aio_poll(bdrv_get_aio_context(bs), true);
} }
if (data.ret < 0) { if (data.ret < 0) {
return data.ret; return data.ret;
@ -2027,7 +2027,7 @@ static const cmdinfo_t resume_cmd = {
static int wait_break_f(BlockDriverState *bs, int argc, char **argv) static int wait_break_f(BlockDriverState *bs, int argc, char **argv)
{ {
while (!bdrv_debug_is_suspended(bs, argv[1])) { while (!bdrv_debug_is_suspended(bs, argv[1])) {
qemu_aio_wait(); aio_poll(bdrv_get_aio_context(bs), true);
} }
return 0; return 0;