mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
block: Assert that flags are up-to-date in bdrv_reopen_prepare()
Towards the end of bdrv_reopen_queue_child(), before starting to process the children, the update_flags_from_options() function is called in order to have BDRVReopenState.flags in sync with the options from the QDict. This is necessary because during the reopen process flags must be updated for all nodes in the queue so bdrv_is_writable_after_reopen() and the permission checks work correctly. Because of that, calling update_flags_from_options() again in bdrv_reopen_prepare() doesn't really change the flags (they are already up-to-date). But we need to call it in order to remove those options from QemuOpts and that way indicate that they have been processed. Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
8eb4b07b6f
commit
e6d79c41c9
6
block.c
6
block.c
|
@ -3197,6 +3197,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
|
|||
Error **errp)
|
||||
{
|
||||
int ret = -1;
|
||||
int old_flags;
|
||||
Error *local_err = NULL;
|
||||
BlockDriver *drv;
|
||||
QemuOpts *opts;
|
||||
|
@ -3223,7 +3224,12 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
|
|||
goto error;
|
||||
}
|
||||
|
||||
/* This was already called in bdrv_reopen_queue_child() so the flags
|
||||
* are up-to-date. This time we simply want to remove the options from
|
||||
* QemuOpts in order to indicate that they have been processed. */
|
||||
old_flags = reopen_state->flags;
|
||||
update_flags_from_options(&reopen_state->flags, opts);
|
||||
assert(old_flags == reopen_state->flags);
|
||||
|
||||
discard = qemu_opt_get_del(opts, BDRV_OPT_DISCARD);
|
||||
if (discard != NULL) {
|
||||
|
|
Loading…
Reference in a new issue