mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 23:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: Fix locking for bdrv_reopen_queue_child()

Browse Source 
Callers don't agree whether bdrv_reopen_queue_child() should be called
with the AioContext lock held or not. Standardise on holding the lock
(as done by QMP blockdev-reopen and the replication block driver) and
fix bdrv_reopen() to do the same.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221118174110.55183-7-kwolf@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf
2022-11-18 18:41:01 +01:00
parent c7bc05f78a
commit 2e117866d7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
block.c
View File

@ -4174,6 +4174,8 @@ static bool bdrv_recurse_has_child(BlockDriverState *bs,
* bs_queue, or the existing bs_queue being used. * bs_queue, or the existing bs_queue being used.
* *
* bs must be drained between bdrv_reopen_queue() and bdrv_reopen_multiple(). * bs must be drained between bdrv_reopen_queue() and bdrv_reopen_multiple().
*
* To be called with bs->aio_context locked.
*/ */
static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
BlockDriverState *bs, BlockDriverState *bs,
@ -4332,6 +4334,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
return bs_queue; return bs_queue;
} }
/* To be called with bs->aio_context locked */
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue, BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
BlockDriverState *bs, BlockDriverState *bs,
QDict *options, bool keep_old_opts) QDict *options, bool keep_old_opts)
@ -4492,11 +4495,11 @@ int bdrv_reopen(BlockDriverState *bs, QDict *opts, bool keep_old_opts,
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
bdrv_subtree_drained_begin(bs); bdrv_subtree_drained_begin(bs);
queue = bdrv_reopen_queue(NULL, bs, opts, keep_old_opts);
if (ctx != qemu_get_aio_context()) { if (ctx != qemu_get_aio_context()) {
aio_context_release(ctx); aio_context_release(ctx);
} }
queue = bdrv_reopen_queue(NULL, bs, opts, keep_old_opts);
ret = bdrv_reopen_multiple(queue, errp); ret = bdrv_reopen_multiple(queue, errp);
if (ctx != qemu_get_aio_context()) { if (ctx != qemu_get_aio_context()) {