Mark assert_bdrv_graph_readable/writable() GRAPH_RD/WRLOCK

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-16-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2022-12-07 14:18:35 +01:00
parent 4002ffdc4f
commit 303de47b2c
3 changed files with 6 additions and 6 deletions

View File

@ -1402,7 +1402,7 @@ static void bdrv_inherited_options(BdrvChildRole role, bool parent_is_format,
*child_flags = flags; *child_flags = flags;
} }
static void bdrv_child_cb_attach(BdrvChild *child) static void GRAPH_WRLOCK bdrv_child_cb_attach(BdrvChild *child)
{ {
BlockDriverState *bs = child->opaque; BlockDriverState *bs = child->opaque;
@ -1444,7 +1444,7 @@ static void bdrv_child_cb_attach(BdrvChild *child)
} }
} }
static void bdrv_child_cb_detach(BdrvChild *child) static void GRAPH_WRLOCK bdrv_child_cb_detach(BdrvChild *child)
{ {
BlockDriverState *bs = child->opaque; BlockDriverState *bs = child->opaque;

View File

@ -898,8 +898,8 @@ struct BdrvChildClass {
void (*activate)(BdrvChild *child, Error **errp); void (*activate)(BdrvChild *child, Error **errp);
int (*inactivate)(BdrvChild *child); int (*inactivate)(BdrvChild *child);
void (*attach)(BdrvChild *child); void GRAPH_WRLOCK_PTR (*attach)(BdrvChild *child);
void (*detach)(BdrvChild *child); void GRAPH_WRLOCK_PTR (*detach)(BdrvChild *child);
/* /*
* Notifies the parent that the filename of its child has changed (e.g. * Notifies the parent that the filename of its child has changed (e.g.

View File

@ -176,14 +176,14 @@ bdrv_graph_rdunlock_main_loop(void);
* or there is at least a reader helding the rdlock. * or there is at least a reader helding the rdlock.
* In this way an incoming writer is aware of the read and waits. * In this way an incoming writer is aware of the read and waits.
*/ */
void assert_bdrv_graph_readable(void); void GRAPH_RDLOCK assert_bdrv_graph_readable(void);
/* /*
* assert_bdrv_graph_writable: * assert_bdrv_graph_writable:
* Make sure that the writer is the main loop and has set @has_writer, * Make sure that the writer is the main loop and has set @has_writer,
* so that incoming readers will pause. * so that incoming readers will pause.
*/ */
void assert_bdrv_graph_writable(void); void GRAPH_WRLOCK assert_bdrv_graph_writable(void);
/* /*
* Calling this function tells TSA that we know that the lock is effectively * Calling this function tells TSA that we know that the lock is effectively