[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 16/16] block: Fix update of BDRV_O_AUTO_RDONLY in
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH v5 16/16] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options() |
Date: |
Mon, 12 Nov 2018 16:00:48 +0200 |
Commit e35bdc123a4ace9f4d3fcca added the auto-read-only option and the
code to update its corresponding flag in update_flags_from_options(),
but forgot to clear the flag if auto-read-only is false.
Signed-off-by: Alberto Garcia <address@hidden>
Reported-by: Max Reitz <address@hidden>
---
block.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/block.c b/block.c
index 03277b3d19..e1a969e331 100644
--- a/block.c
+++ b/block.c
@@ -1137,7 +1137,7 @@ static int bdrv_open_flags(BlockDriverState *bs, int
flags)
static void update_flags_from_options(int *flags, QemuOpts *opts)
{
- *flags &= ~BDRV_O_CACHE_MASK;
+ *flags &= ~(BDRV_O_CACHE_MASK | BDRV_O_RDWR | BDRV_O_AUTO_RDONLY);
if (qemu_opt_get_bool_del(opts, BDRV_OPT_CACHE_NO_FLUSH, false)) {
*flags |= BDRV_O_NO_FLUSH;
@@ -1147,8 +1147,6 @@ static void update_flags_from_options(int *flags,
QemuOpts *opts)
*flags |= BDRV_O_NOCACHE;
}
- *flags &= ~BDRV_O_RDWR;
-
if (!qemu_opt_get_bool_del(opts, BDRV_OPT_READ_ONLY, false)) {
*flags |= BDRV_O_RDWR;
}
--
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, 2018/11/12
- [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 <=
- [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
- [Qemu-block] [PATCH v5 07/16] block: Use bdrv_reopen_set_read_only() in external_snapshot_commit(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 04/16] block: Use bdrv_reopen_set_read_only() in bdrv_commit(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 01/16] block: Add bdrv_reopen_set_read_only(), Alberto Garcia, 2018/11/12