[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 15/16] block: Assert that flags are up-to-date in
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH v5 15/16] block: Assert that flags are up-to-date in bdrv_reopen_prepare() |
Date: |
Mon, 12 Nov 2018 16:00:47 +0200 |
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 <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/block.c b/block.c
index 68f1e3b45e..03277b3d19 100644
--- a/block.c
+++ b/block.c
@@ -3178,6 +3178,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;
@@ -3203,7 +3204,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) {
--
2.11.0
- [Qemu-block] [PATCH v5 00/16] Don't pass flags to bdrv_reopen_queue(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 05/16] block: Use bdrv_reopen_set_read_only() in stream_start/complete(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 08/16] block: Use bdrv_reopen_set_read_only() in the mirror driver, Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 15/16] block: Assert that flags are up-to-date in bdrv_reopen_prepare(),
Alberto Garcia <=
- [Qemu-block] [PATCH v5 06/16] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 11/16] block: Clean up reopen_backing_file() in block/replication.c, Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 16/16] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 02/16] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 03/16] block: Use bdrv_reopen_set_read_only() in commit_start/complete(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 13/16] block: Stop passing flags to bdrv_reopen_queue_child(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 12/16] block: Remove flags parameter from bdrv_reopen_queue(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 09/16] block: Drop bdrv_reopen(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 14/16] block: Remove assertions from update_flags_from_options(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 10/16] qemu-io: Put flag changes in the options QDict in reopen_f(), Alberto Garcia, 2018/11/12