[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 04/14] block: Use bdrv_reopen_set_read_only() in com
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH 04/14] block: Use bdrv_reopen_set_read_only() in commit_start/complete() |
Date: |
Wed, 19 Sep 2018 17:47:42 +0300 |
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>
---
block/commit.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index eb414579bd..fcadcab33a 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -37,7 +37,7 @@ typedef struct CommitBlockJob {
BlockBackend *top;
BlockBackend *base;
BlockdevOnError on_error;
- int base_flags;
+ bool base_read_only;
char *backing_file_str;
} CommitBlockJob;
@@ -105,8 +105,8 @@ static void commit_complete(Job *job, void *opaque)
/* restore base open flags here if appropriate (e.g., change the base back
* to r/o). These reopens do not need to be atomic, since we won't abort
* even on failure here */
- if (s->base_flags != bdrv_get_flags(base)) {
- bdrv_reopen(base, s->base_flags, NULL);
+ if (s->base_read_only) {
+ bdrv_reopen_set_read_only(base, true, NULL);
}
g_free(s->backing_file_str);
blk_unref(s->top);
@@ -265,7 +265,6 @@ void commit_start(const char *job_id, BlockDriverState *bs,
const char *filter_node_name, Error **errp)
{
CommitBlockJob *s;
- int orig_base_flags;
BlockDriverState *iter;
BlockDriverState *commit_top_bs = NULL;
Error *local_err = NULL;
@@ -284,11 +283,9 @@ void commit_start(const char *job_id, BlockDriverState *bs,
}
/* convert base to r/w, if necessary */
- orig_base_flags = bdrv_get_flags(base);
- if (!(orig_base_flags & BDRV_O_RDWR)) {
- bdrv_reopen(base, orig_base_flags | BDRV_O_RDWR, &local_err);
- if (local_err != NULL) {
- error_propagate(errp, local_err);
+ s->base_read_only = bdrv_is_read_only(base);
+ if (s->base_read_only) {
+ if (bdrv_reopen_set_read_only(base, false, errp) != 0) {
goto fail;
}
}
@@ -363,7 +360,6 @@ void commit_start(const char *job_id, BlockDriverState *bs,
goto fail;
}
- s->base_flags = orig_base_flags;
s->backing_file_str = g_strdup(backing_file_str);
s->on_error = on_error;
--
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 <=
- [Qemu-block] [PATCH 09/14] block: Use bdrv_reopen_set_read_only() in the mirror driver, Alberto Garcia, 2018/09/19
- [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