diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-09-29 16:51:49 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-10-12 16:31:33 +0200 |
| commit | 0bb79c97fd8e355aca433f4331d7d45e7e72b4b6 (patch) | |
| tree | f3fe385db7fe95942384ecc382ee644962b7a45d /include | |
| parent | bd131d6705b6996f2cdccee3db017af570ce91ad (diff) | |
| download | focaccia-qemu-0bb79c97fd8e355aca433f4331d7d45e7e72b4b6.tar.gz focaccia-qemu-0bb79c97fd8e355aca433f4331d7d45e7e72b4b6.zip | |
qcow2: Mark qcow2_signal_corruption() and callers GRAPH_RDLOCK
This adds GRAPH_RDLOCK annotations to declare that callers of qcow2_signal_corruption() need to hold a reader lock for the graph because it calls bdrv_get_node_name(), which accesses the parents list of a node. For some places, we know that they will hold the lock, but we don't have the GRAPH_RDLOCK annotations yet. In this case, add assume_graph_lock() with a FIXME comment. These places will be removed once everything is properly annotated. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-ID: <20230929145157.45443-15-kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block-global-state.h | 2 | ||||
| -rw-r--r-- | include/block/block_int-common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h index 9dc35133a8..794ef34ded 100644 --- a/include/block/block-global-state.h +++ b/include/block/block-global-state.h @@ -138,7 +138,7 @@ void GRAPH_RDLOCK bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **errp); int bdrv_commit(BlockDriverState *bs); -int bdrv_make_empty(BdrvChild *c, Error **errp); +int GRAPH_RDLOCK bdrv_make_empty(BdrvChild *c, Error **errp); int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, const char *backing_fmt, bool warn); void bdrv_register(BlockDriver *bdrv); diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h index c8661775f4..d971d73f8f 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -264,7 +264,7 @@ struct BlockDriver { BlockDriverAmendStatusCB *status_cb, void *cb_opaque, bool force, Error **errp); - int (*bdrv_make_empty)(BlockDriverState *bs); + int GRAPH_RDLOCK_PTR (*bdrv_make_empty)(BlockDriverState *bs); /* * Refreshes the bs->exact_filename field. If that is impossible, |