Commit ba9e75ce authored by Fam Zheng's avatar Fam Zheng
Browse files

coroutine: Extract qemu_aio_coroutine_enter 



It's a variant of qemu_coroutine_enter with an explicit AioContext
parameter.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Acked-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d90fce94

include/qemu/coroutine.h

+5 −0
Original line number Diff line number Diff line
@@ -76,6 +76,11 @@ void qemu_coroutine_enter(Coroutine *coroutine); 
 */

void qemu_coroutine_enter_if_inactive(Coroutine *co);



/**

 * Transfer control to a coroutine and associate it with ctx

 */

void qemu_aio_coroutine_enter(AioContext *ctx, Coroutine *co);



/**

 * Transfer control back to a coroutine's caller

 *

util/qemu-coroutine.c

+8 −3
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ static void coroutine_delete(Coroutine *co) 
    qemu_coroutine_delete(co);

}



void qemu_coroutine_enter(Coroutine *co)

void qemu_aio_coroutine_enter(AioContext *ctx, Coroutine *co)

{

    Coroutine *self = qemu_coroutine_self();

    CoroutineAction ret;



    trace_qemu_coroutine_enter(self, co, co->entry_arg);

    trace_qemu_aio_coroutine_enter(ctx, self, co, co->entry_arg);



    if (co->caller) {

        fprintf(stderr, "Co-routine re-entered recursively\n");
@@ -115,7 +115,7 @@ void qemu_coroutine_enter(Coroutine *co) 
    }



    co->caller = self;

    co->ctx = qemu_get_current_aio_context();

    co->ctx = ctx;



    /* Store co->ctx before anything that stores co.  Matches

     * barrier in aio_co_wake and qemu_co_mutex_wake.
@@ -139,6 +139,11 @@ void qemu_coroutine_enter(Coroutine *co) 
    }

}



void qemu_coroutine_enter(Coroutine *co)

{

    qemu_aio_coroutine_enter(qemu_get_current_aio_context(), co);

}



void qemu_coroutine_enter_if_inactive(Coroutine *co)

{

    if (!qemu_coroutine_entered(co)) {

util/trace-events

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ buffer_move(const char *buf, size_t len, const char *from) "%s: %zd bytes from % 
buffer_free(const char *buf, size_t len) "%s: capacity %zd"



# util/qemu-coroutine.c

qemu_coroutine_enter(void *from, void *to, void *opaque) "from %p to %p opaque %p"

qemu_aio_coroutine_enter(void *ctx, void *from, void *to, void *opaque) "ctx %p from %p to %p opaque %p"

qemu_coroutine_yield(void *from, void *to) "from %p to %p"

qemu_coroutine_terminate(void *co) "self %p"