Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- block/blkdebug.c | 15 ++++++++++----- block/blkverify.c | 3 ++- block/io.c | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c index a1b24b9b0d..d55e2e69c8 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -483,7 +483,8 @@ out: return ret; } -static int rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) +static int coroutine_fn +rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes) { BDRVBlkdebugState *s = bs->opaque; BlkdebugRule *rule = NULL; @@ -563,7 +564,8 @@ blkdebug_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes, return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags); } -static int blkdebug_co_flush(BlockDriverState *bs) +static int coroutine_fn +blkdebug_co_flush(BlockDriverState *bs) { int err = rule_check(bs, 0, 0); @@ -656,7 +658,8 @@ static void blkdebug_close(BlockDriverState *bs) g_free(s->config_file); } -static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) +static void coroutine_fn +suspend_request(BlockDriverState *bs, BlkdebugRule *rule) { BDRVBlkdebugState *s = bs->opaque; BlkdebugSuspendedReq r; @@ -681,7 +684,8 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) g_free(r.tag); } -static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, +static bool coroutine_fn +process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, bool injected) { BDRVBlkdebugState *s = bs->opaque; @@ -712,7 +716,8 @@ static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, return injected; } -static void blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) +static void coroutine_fn +blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) { BDRVBlkdebugState *s = bs->opaque; struct BlkdebugRule *rule, *next; diff --git a/block/blkverify.c b/block/blkverify.c index 06369f9eac..d0c946173a 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -255,7 +255,8 @@ blkverify_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes, return blkverify_co_prwv(bs, &r, offset, bytes, qiov, qiov, flags, true); } -static int blkverify_co_flush(BlockDriverState *bs) +static int coroutine_fn +blkverify_co_flush(BlockDriverState *bs) { BDRVBlkverifyState *s = bs->opaque; diff --git a/block/io.c b/block/io.c index 14b88c8609..a53a86df3e 100644 --- a/block/io.c +++ b/block/io.c @@ -366,7 +366,8 @@ void bdrv_drain_all(void) * * This function should be called when a tracked request is completing. */ -static void tracked_request_end(BdrvTrackedRequest *req) +static void coroutine_fn +tracked_request_end(BdrvTrackedRequest *req) { if (req->serialising) { atomic_dec(&req->bs->serialising_in_flight); @@ -381,7 +382,8 @@ static void tracked_request_end(BdrvTrackedRequest *req) /** * Add an active request to the tracked requests list */ -static void tracked_request_begin(BdrvTrackedRequest *req, +static void coroutine_fn +tracked_request_begin(BdrvTrackedRequest *req, BlockDriverState *bs, int64_t offset, unsigned int bytes, @@ -2430,7 +2432,8 @@ int bdrv_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) return rwco.ret; } -int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf) +int coroutine_fn +bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf) { BlockDriver *drv = bs->drv; CoroutineIOCompletion co = { -- 2.13.1.395.gf7b71de06