>From 447601c28d5ed0b1208a0560390f760e75ce5613 Mon Sep 17 00:00:00 2001 From: Cenne Dee <cennedee+qemu-de...@protonmail.com> Date: Fri, 30 Apr 2021 15:52:28 -0400 Subject: [PATCH] Add missing coroutine_fn function signature to functions
Patch adds the signature for all relevant functions ending with _co or those that use them. Signed-off-by: Cenne Dee <cennedee+qemu-de...@protonmail.com> --- block/block-gen.h | 2 +- migration/migration.c | 2 +- monitor/hmp.c | 2 +- scsi/qemu-pr-helper.c | 2 +- tests/unit/test-thread-pool.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/block-gen.h b/block/block-gen.h index f80cf48..4963372 100644 --- a/block/block-gen.h +++ b/block/block-gen.h @@ -36,7 +36,7 @@ typedef struct BdrvPollCo { Coroutine *co; /* Keep pointer here for debugging */ } BdrvPollCo; -static inline int bdrv_poll_co(BdrvPollCo *s) +static inline int coroutine_fn bdrv_poll_co(BdrvPollCo *s) { assert(!qemu_in_coroutine()); diff --git a/migration/migration.c b/migration/migration.c index 8ca0341..1acade8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -539,7 +539,7 @@ static void process_incoming_migration_bh(void *opaque) migration_incoming_state_destroy(); } -static void process_incoming_migration_co(void *opaque) +static void coroutine_fn process_incoming_migration_co(void *opaque) { MigrationIncomingState *mis = migration_incoming_get_current(); PostcopyState ps; diff --git a/monitor/hmp.c b/monitor/hmp.c index 6c0b33a..0a16d61 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1068,7 +1068,7 @@ typedef struct HandleHmpCommandCo { bool done; } HandleHmpCommandCo; -static void handle_hmp_command_co(void *opaque) +static void coroutine_fn handle_hmp_command_co(void *opaque) { HandleHmpCommandCo *data = opaque; data->cmd->cmd(data->mon, data->qdict); diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index 7b9389b..7c1ed2a 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -175,7 +175,7 @@ static int do_sgio_worker(void *opaque) return status; } -static int do_sgio(int fd, const uint8_t *cdb, uint8_t *sense, +static int coroutine_fn do_sgio(int fd, const uint8_t *cdb, uint8_t *sense, uint8_t *buf, int *sz, int dir) { ThreadPool *pool = aio_get_thread_pool(qemu_get_aio_context()); diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c index 70dc631..21fc118 100644 --- a/tests/unit/test-thread-pool.c +++ b/tests/unit/test-thread-pool.c @@ -72,7 +72,7 @@ static void test_submit_aio(void) g_assert_cmpint(data.ret, ==, 0); } -static void co_test_cb(void *opaque) +static void coroutine_fn co_test_cb(void *opaque) { WorkerTestData *data = opaque; @@ -90,7 +90,7 @@ static void co_test_cb(void *opaque) /* The test continues in test_submit_co, after aio_poll... */ } -static void test_submit_co(void) +static void coroutine_fn test_submit_co(void) { WorkerTestData data; Coroutine *co = qemu_coroutine_create(co_test_cb, &data); -- 2.31.1