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

coroutine: move entry argument to qemu_coroutine_create 



In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c).  So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.

Mostly done with the following semantic patch:

@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
  ...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);

@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
  ...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);

@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));

@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);

except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 7e70cdba

block.c

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ int bdrv_create(BlockDriver *drv, const char* filename, 
        /* Fast-path if already in coroutine context */

        bdrv_create_co_entry(&cco);

    } else {

        co = qemu_coroutine_create(bdrv_create_co_entry);

        qemu_coroutine_enter(co, &cco);

        co = qemu_coroutine_create(bdrv_create_co_entry, &cco);

        qemu_coroutine_enter(co);

        while (cco.ret == NOT_DONE) {

            aio_poll(qemu_get_aio_context(), true);

        }

block/backup.c

+2 −2
Original line number Diff line number Diff line
@@ -576,9 +576,9 @@ void backup_start(const char *job_id, BlockDriverState *bs, 


    bdrv_op_block_all(target, job->common.blocker);

    job->common.len = len;

    job->common.co = qemu_coroutine_create(backup_run);

    job->common.co = qemu_coroutine_create(backup_run, job);

    block_job_txn_add_job(txn, &job->common);

    qemu_coroutine_enter(job->common.co, job);

    qemu_coroutine_enter(job->common.co);

    return;



 error:

block/blkdebug.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static int blkdebug_debug_resume(BlockDriverState *bs, const char *tag) 


    QLIST_FOREACH_SAFE(r, &s->suspended_reqs, next, next) {

        if (!strcmp(r->tag, tag)) {

            qemu_coroutine_enter(r->co, NULL);

            qemu_coroutine_enter(r->co);

            return 0;

        }

    }
@@ -647,7 +647,7 @@ static int blkdebug_debug_remove_breakpoint(BlockDriverState *bs, 
    }

    QLIST_FOREACH_SAFE(r, &s->suspended_reqs, next, r_next) {

        if (!strcmp(r->tag, tag)) {

            qemu_coroutine_enter(r->co, NULL);

            qemu_coroutine_enter(r->co);

            ret = 0;

        }

    }

block/blkreplay.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int64_t blkreplay_getlength(BlockDriverState *bs) 
static void blkreplay_bh_cb(void *opaque)

{

    Request *req = opaque;

    qemu_coroutine_enter(req->co, NULL);

    qemu_coroutine_enter(req->co);

    qemu_bh_delete(req->bh);

    g_free(req);

}

block/block-backend.c

+4 −4
Original line number Diff line number Diff line
@@ -836,8 +836,8 @@ static int blk_prw(BlockBackend *blk, int64_t offset, uint8_t *buf, 
        .ret    = NOT_DONE,

    };



    co = qemu_coroutine_create(co_entry);

    qemu_coroutine_enter(co, &rwco);

    co = qemu_coroutine_create(co_entry, &rwco);

    qemu_coroutine_enter(co);



    aio_context = blk_get_aio_context(blk);

    while (rwco.ret == NOT_DONE) {
@@ -950,8 +950,8 @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes, 
    acb->bh = NULL;

    acb->has_returned = false;



    co = qemu_coroutine_create(co_entry);

    qemu_coroutine_enter(co, acb);

    co = qemu_coroutine_create(co_entry, acb);

    qemu_coroutine_enter(co);



    acb->has_returned = true;

    if (acb->rwco.ret != NOT_DONE) {