[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 06/16] block: Use bdrv_reopen_set_read_only() in
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH v5 06/16] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file() |
Date: |
Mon, 12 Nov 2018 16:00:38 +0200 |
This patch replaces the bdrv_reopen() calls that set and remove the
BDRV_O_RDWR flag with the new bdrv_reopen_set_read_only() function.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
blockdev.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index e5b5eb46e2..20d1d84bab 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -4100,7 +4100,6 @@ void qmp_change_backing_file(const char *device,
BlockDriverState *image_bs = NULL;
Error *local_err = NULL;
bool ro;
- int open_flags;
int ret;
bs = qmp_get_root_bs(device, errp);
@@ -4142,13 +4141,10 @@ void qmp_change_backing_file(const char *device,
}
/* if not r/w, reopen to make r/w */
- open_flags = image_bs->open_flags;
ro = bdrv_is_read_only(image_bs);
if (ro) {
- bdrv_reopen(image_bs, open_flags | BDRV_O_RDWR, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (bdrv_reopen_set_read_only(image_bs, false, errp) != 0) {
goto out;
}
}
@@ -4164,7 +4160,7 @@ void qmp_change_backing_file(const char *device,
}
if (ro) {
- bdrv_reopen(image_bs, open_flags, &local_err);
+ bdrv_reopen_set_read_only(image_bs, true, &local_err);
error_propagate(errp, local_err);
}
--
2.11.0
- [Qemu-devel] [PATCH v5 00/16] Don't pass flags to bdrv_reopen_queue(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 05/16] block: Use bdrv_reopen_set_read_only() in stream_start/complete(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 08/16] block: Use bdrv_reopen_set_read_only() in the mirror driver, Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 06/16] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file(),
Alberto Garcia <=
- [Qemu-devel] [PATCH v5 16/16] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 11/16] block: Clean up reopen_backing_file() in block/replication.c, Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 02/16] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 15/16] block: Assert that flags are up-to-date in bdrv_reopen_prepare(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 09/16] block: Drop bdrv_reopen(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 03/16] block: Use bdrv_reopen_set_read_only() in commit_start/complete(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 13/16] block: Stop passing flags to bdrv_reopen_queue_child(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 12/16] block: Remove flags parameter from bdrv_reopen_queue(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 14/16] block: Remove assertions from update_flags_from_options(), Alberto Garcia, 2018/11/12
- [Qemu-devel] [PATCH v5 10/16] qemu-io: Put flag changes in the options QDict in reopen_f(), Alberto Garcia, 2018/11/12