mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
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: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
7e70cdba9f
commit
0b8b8753e4
37 changed files with 130 additions and 131 deletions
12
nbd/server.c
12
nbd/server.c
|
@ -106,7 +106,7 @@ static gboolean nbd_negotiate_continue(QIOChannel *ioc,
|
|||
GIOCondition condition,
|
||||
void *opaque)
|
||||
{
|
||||
qemu_coroutine_enter(opaque, NULL);
|
||||
qemu_coroutine_enter(opaque);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
@ -1230,9 +1230,9 @@ static void nbd_read(void *opaque)
|
|||
NBDClient *client = opaque;
|
||||
|
||||
if (client->recv_coroutine) {
|
||||
qemu_coroutine_enter(client->recv_coroutine, NULL);
|
||||
qemu_coroutine_enter(client->recv_coroutine);
|
||||
} else {
|
||||
qemu_coroutine_enter(qemu_coroutine_create(nbd_trip), client);
|
||||
qemu_coroutine_enter(qemu_coroutine_create(nbd_trip, client));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1240,7 +1240,7 @@ static void nbd_restart_write(void *opaque)
|
|||
{
|
||||
NBDClient *client = opaque;
|
||||
|
||||
qemu_coroutine_enter(client->send_coroutine, NULL);
|
||||
qemu_coroutine_enter(client->send_coroutine);
|
||||
}
|
||||
|
||||
static void nbd_set_handlers(NBDClient *client)
|
||||
|
@ -1324,6 +1324,6 @@ void nbd_client_new(NBDExport *exp,
|
|||
client->close = close_fn;
|
||||
|
||||
data->client = client;
|
||||
data->co = qemu_coroutine_create(nbd_co_client_start);
|
||||
qemu_coroutine_enter(data->co, data);
|
||||
data->co = qemu_coroutine_create(nbd_co_client_start, data);
|
||||
qemu_coroutine_enter(data->co);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue