[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 09/14] block: Use bdrv_reopen_set_read_only() in the
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH 09/14] block: Use bdrv_reopen_set_read_only() in the mirror driver |
Date: |
Wed, 19 Sep 2018 17:47:47 +0300 |
The 'block-commit' QMP command is implemented internally using two
different drivers. If the source image is the active layer then the
mirror driver is used (commit_active_start()), otherwise the commit
driver is used (commit_start()).
In both cases the destination image must be put temporarily in
read-write mode. This is done correctly in the latter case, but what
commit_active_start() does is copy all flags instead.
This patch replaces the bdrv_reopen() calls in that function with
bdrv_reopen_set_read_only() so that only the read-only status is
changed.
A similar change is made in mirror_exit(), which is also used by the
'drive-mirror' and 'blockdev-mirror' commands.
Signed-off-by: Alberto Garcia <address@hidden>
---
block/mirror.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 6cc10df5c9..37f8d3ac56 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -663,13 +663,15 @@ static void mirror_exit(Job *job, void *opaque)
}
if (s->should_complete && data->ret == 0) {
+ bool ro;
BlockDriverState *to_replace = src;
if (s->to_replace) {
to_replace = s->to_replace;
}
- if (bdrv_get_flags(target_bs) != bdrv_get_flags(to_replace)) {
- bdrv_reopen(target_bs, bdrv_get_flags(to_replace), NULL);
+ ro = bdrv_is_read_only(to_replace);
+ if (ro != bdrv_is_read_only(target_bs)) {
+ bdrv_reopen_set_read_only(target_bs, ro, NULL);
}
/* The mirror job has no requests in flight any more, but we need to
@@ -1674,13 +1676,15 @@ void commit_active_start(const char *job_id,
BlockDriverState *bs,
BlockCompletionFunc *cb, void *opaque,
bool auto_complete, Error **errp)
{
- int orig_base_flags;
+ bool base_read_only;
Error *local_err = NULL;
- orig_base_flags = bdrv_get_flags(base);
+ base_read_only = bdrv_is_read_only(base);
- if (bdrv_reopen(base, bs->open_flags, errp)) {
- return;
+ if (base_read_only) {
+ if (bdrv_reopen_set_read_only(base, false, errp) < 0) {
+ return;
+ }
}
mirror_start_job(job_id, bs, creation_flags, base, NULL, speed, 0, 0,
@@ -1699,6 +1703,8 @@ void commit_active_start(const char *job_id,
BlockDriverState *bs,
error_restore_flags:
/* ignore error and errp for bdrv_reopen, because we want to propagate
* the original error */
- bdrv_reopen(base, orig_base_flags, NULL);
+ if (base_read_only) {
+ bdrv_reopen_set_read_only(base, true, NULL);
+ }
return;
}
--
2.11.0
- [Qemu-block] [PATCH 00/14] Don't pass flags to bdrv_reopen_queue(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 08/14] block: Use bdrv_reopen_set_read_only() in external_snapshot_commit(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 03/14] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 05/14] block: Use bdrv_reopen_set_read_only() in bdrv_commit(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 07/14] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 02/14] block: Add bdrv_reopen_set_read_only(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 04/14] block: Use bdrv_reopen_set_read_only() in commit_start/complete(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 09/14] block: Use bdrv_reopen_set_read_only() in the mirror driver,
Alberto Garcia <=
- [Qemu-block] [PATCH 06/14] block: Use bdrv_reopen_set_read_only() in stream_start/complete(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 01/14] block: Don't call update_flags_from_options() if the options are wrong, Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 11/14] qemu-io: Put flag changes in the options QDict in reopen_f(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 10/14] block: Drop bdrv_reopen(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 12/14] block: Clean up reopen_backing_file() in block/replication.c, Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 14/14] block: Stop passing flags to bdrv_reopen_queue_child(), Alberto Garcia, 2018/09/19
- [Qemu-block] [PATCH 13/14] block: Remove flags parameter from bdrv_reopen_queue(), Alberto Garcia, 2018/09/19