diff options
| author | Alberto Faria <afaria@redhat.com> | 2022-07-05 17:15:23 +0100 |
|---|---|---|
| committer | Hanna Reitz <hreitz@redhat.com> | 2022-07-12 12:14:56 +0200 |
| commit | df02da003daabe2666c13db3d539a7bce6f8b24b (patch) | |
| tree | d9ede672f4eefb9aa7bd01a7516036e466f8fd67 /block | |
| parent | 25873f57c6c927999b5a613204acaa2e221d8e14 (diff) | |
| download | qemu-df02da003daabe2666c13db3d539a7bce6f8b24b.zip qemu-df02da003daabe2666c13db3d539a7bce6f8b24b.tar.gz qemu-df02da003daabe2666c13db3d539a7bce6f8b24b.tar.bz2 | |
block: Add blk_co_ioctl()
Also convert blk_ioctl() into a generated_co_wrapper.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220705161527.1054072-16-afaria@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 7 | ||||
| -rw-r--r-- | block/coroutines.h | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 783a77c..a31b9f1 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1620,7 +1620,7 @@ void blk_aio_cancel_async(BlockAIOCB *acb) } /* To be called between exactly one pair of blk_inc/dec_in_flight() */ -int coroutine_fn +static int coroutine_fn blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf) { IO_CODE(); @@ -1634,13 +1634,14 @@ blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf) return bdrv_co_ioctl(blk_bs(blk), req, buf); } -int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf) +int coroutine_fn blk_co_ioctl(BlockBackend *blk, unsigned long int req, + void *buf) { int ret; IO_OR_GS_CODE(); blk_inc_in_flight(blk); - ret = blk_do_ioctl(blk, req, buf); + ret = blk_co_do_ioctl(blk, req, buf); blk_dec_in_flight(blk); return ret; diff --git a/block/coroutines.h b/block/coroutines.h index 7e94b9f..d66551a 100644 --- a/block/coroutines.h +++ b/block/coroutines.h @@ -69,9 +69,6 @@ blk_co_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes, BdrvRequestFlags flags); int coroutine_fn -blk_co_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); - -int coroutine_fn blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes); int coroutine_fn blk_co_do_flush(BlockBackend *blk); @@ -107,7 +104,4 @@ bdrv_common_block_status_above(BlockDriverState *bs, int generated_co_wrapper nbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error **errp); -int generated_co_wrapper -blk_do_ioctl(BlockBackend *blk, unsigned long int req, void *buf); - #endif /* BLOCK_COROUTINES_H */ |