Commit b47ec2c4 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

block: prefer aio_poll to qemu_aio_wait 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 01fb2705

block.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

blockjob.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

qemu-io-cmds.c

+2 −2
Original line number Diff line number Diff line
@@ -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;