diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-02-03 16:21:44 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-02-23 19:49:09 +0100 |
| commit | 26c518ab1e2159fd4b8f6819af2bdba35e6416f5 (patch) | |
| tree | 063c860b92e1256baa3914ecc03b10df95f1ee95 /include/block | |
| parent | 7ff9579e60a42e253c6bbbd7ba613f19cc007259 (diff) | |
| download | qemu-26c518ab1e2159fd4b8f6819af2bdba35e6416f5.zip qemu-26c518ab1e2159fd4b8f6819af2bdba35e6416f5.tar.gz qemu-26c518ab1e2159fd4b8f6819af2bdba35e6416f5.tar.bz2 | |
block: Mark bdrv_co_ioctl() and callers GRAPH_RDLOCK
This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_co_ioctl() need to hold a reader lock for the graph.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230203152202.49054-6-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/block-io.h | 3 | ||||
| -rw-r--r-- | include/block/block_int-common.h | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/block/block-io.h b/include/block/block-io.h index 6303501..3f42c76 100644 --- a/include/block/block-io.h +++ b/include/block/block-io.h @@ -97,7 +97,8 @@ void bdrv_aio_cancel(BlockAIOCB *acb); void bdrv_aio_cancel_async(BlockAIOCB *acb); /* sg packet commands */ -int coroutine_fn bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); +int coroutine_fn GRAPH_RDLOCK +bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); /* Ensure contents are flushed to disk. */ int coroutine_fn bdrv_co_flush(BlockDriverState *bs); diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h index 5f0104a..64700da 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -714,11 +714,12 @@ struct BlockDriver { void coroutine_fn (*bdrv_co_lock_medium)(BlockDriverState *bs, bool locked); /* to control generic scsi devices */ - BlockAIOCB *(*bdrv_aio_ioctl)(BlockDriverState *bs, - unsigned long int req, void *buf, + BlockAIOCB *coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_aio_ioctl)( + BlockDriverState *bs, unsigned long int req, void *buf, BlockCompletionFunc *cb, void *opaque); - int coroutine_fn (*bdrv_co_ioctl)(BlockDriverState *bs, - unsigned long int req, void *buf); + + int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_ioctl)( + BlockDriverState *bs, unsigned long int req, void *buf); /* * Returns 0 for completed check, -errno for internal errors. |