diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-06-05 10:57:08 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-06-28 08:46:18 +0200 |
| commit | 8aa045421979e59fa27cae6056471d33406a1eba (patch) | |
| tree | e8a9d9e37dbcd59b6af71804e3a8132d9a1ff61b | |
| parent | f665f01f729680077fc0ff2e5489618d9ecc380e (diff) | |
| download | focaccia-qemu-8aa045421979e59fa27cae6056471d33406a1eba.tar.gz focaccia-qemu-8aa045421979e59fa27cae6056471d33406a1eba.zip | |
block: Fix AioContext locking in bdrv_open_backing_file()
bdrv_set_backing() requires the caller to hold the AioContext lock for @backing_hd. Take it in bdrv_open_backing_file() before calling the function. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-ID: <20230605085711.21261-9-kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/block.c b/block.c index 9815a6b6dc..dc691b9832 100644 --- a/block.c +++ b/block.c @@ -3526,6 +3526,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options, int ret = 0; bool implicit_backing = false; BlockDriverState *backing_hd; + AioContext *backing_hd_ctx; QDict *options; QDict *tmp_parent_options = NULL; Error *local_err = NULL; @@ -3610,8 +3611,12 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options, /* Hook up the backing file link; drop our reference, bs owns the * backing_hd reference now */ + backing_hd_ctx = bdrv_get_aio_context(backing_hd); + aio_context_acquire(backing_hd_ctx); ret = bdrv_set_backing_hd(bs, backing_hd, errp); bdrv_unref(backing_hd); + aio_context_release(backing_hd_ctx); + if (ret < 0) { goto free_exit; } |