[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v4 15/15] block: Assert that flags are up-to-dat
From: |
Max Reitz |
Subject: |
Re: [Qemu-block] [PATCH v4 15/15] block: Assert that flags are up-to-date in bdrv_reopen_prepare() |
Date: |
Sun, 11 Nov 2018 22:06:41 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 |
On 07.11.18 13:59, Alberto Garcia wrote:
> 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>
> ---
> 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);
Reviewed-by: Max Reitz <address@hidden>
Although as my bike-shedding for today I'd like to say that I'd find it
more intuitive to store the "just remove the options" call result into
old_flags instead (or rather something renamed), i.e.
flags_copy = reopen_state->flags;
update_flags_from_options(&flags_copy, opts);
assert(flags_copy == reopen_state->flags);
Not that it matters.
Max
signature.asc
Description: OpenPGP digital signature
- [Qemu-block] [PATCH v4 00/15] Don't pass flags to bdrv_reopen_queue(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 08/15] block: Use bdrv_reopen_set_read_only() in the mirror driver, Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 11/15] block: Clean up reopen_backing_file() in block/replication.c, Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 04/15] block: Use bdrv_reopen_set_read_only() in bdrv_commit(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 09/15] block: Drop bdrv_reopen(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 06/15] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 15/15] block: Assert that flags are up-to-date in bdrv_reopen_prepare(), Alberto Garcia, 2018/11/07
- Re: [Qemu-block] [PATCH v4 15/15] block: Assert that flags are up-to-date in bdrv_reopen_prepare(),
Max Reitz <=
- [Qemu-block] [PATCH v4 02/15] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 05/15] block: Use bdrv_reopen_set_read_only() in stream_start/complete(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 12/15] block: Remove flags parameter from bdrv_reopen_queue(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 13/15] block: Stop passing flags to bdrv_reopen_queue_child(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 03/15] block: Use bdrv_reopen_set_read_only() in commit_start/complete(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 07/15] block: Use bdrv_reopen_set_read_only() in external_snapshot_commit(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 01/15] block: Add bdrv_reopen_set_read_only(), Alberto Garcia, 2018/11/07
- [Qemu-block] [PATCH v4 10/15] qemu-io: Put flag changes in the options QDict in reopen_f(), Alberto Garcia, 2018/11/07