commit 356f4ef611df18f6f8323a9fe6e6b4963272bf74
author Kevin Wolf <kwolf@redhat.com> Mon Sep 11 11:46:15 2023 +0200
committer Kevin Wolf <kwolf@redhat.com> Wed Sep 20 17:46:01 2023 +0200
tree b828ed64efd6a6c1ec9126c44c07ed17d3a62489
parent c629b6d22349c83ca262d1887c0920e87ec0bfdb

block: Mark bdrv_parent_cb_change_media() GRAPH_RDLOCK

The function reads the parents list, so it needs to hold the graph lock.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20230911094620.45040-17-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block.c

diff --git a/block.c b/block.c
index 0f7f78f..06d2a1b 100644
--- a/block.c
+++ b/block.c
@@ -3371,7 +3371,8 @@
 }
 
 
-static void bdrv_parent_cb_change_media(BlockDriverState *bs, bool load)
+static void GRAPH_RDLOCK
+bdrv_parent_cb_change_media(BlockDriverState *bs, bool load)
 {
     BdrvChild *c;
     GLOBAL_STATE_CODE();
@@ -3969,6 +3970,9 @@
     GLOBAL_STATE_CODE();
     assert(!qemu_in_coroutine());
 
+    /* TODO We'll eventually have to take a writer lock in this function */
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     if (reference) {
         bool options_non_empty = options ? qdict_size(options) : false;
         qobject_unref(options);