[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 02/15] block: Use bdrv_reopen_set_read_only() in
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH v4 02/15] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename() |
Date: |
Wed, 7 Nov 2018 14:59:37 +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>
---
block.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 4e82c71ba4..cfa53f7114 100644
--- a/block.c
+++ b/block.c
@@ -1079,11 +1079,11 @@ static int bdrv_backing_update_filename(BdrvChild *c,
BlockDriverState *base,
const char *filename, Error **errp)
{
BlockDriverState *parent = c->opaque;
- int orig_flags = bdrv_get_flags(parent);
+ bool read_only = bdrv_is_read_only(parent);
int ret;
- if (!(orig_flags & BDRV_O_RDWR)) {
- ret = bdrv_reopen(parent, orig_flags | BDRV_O_RDWR, errp);
+ if (read_only) {
+ ret = bdrv_reopen_set_read_only(parent, false, errp);
if (ret < 0) {
return ret;
}
@@ -1095,8 +1095,8 @@ static int bdrv_backing_update_filename(BdrvChild *c,
BlockDriverState *base,
error_setg_errno(errp, -ret, "Could not update backing file link");
}
- if (!(orig_flags & BDRV_O_RDWR)) {
- bdrv_reopen(parent, orig_flags, NULL);
+ if (read_only) {
+ bdrv_reopen_set_read_only(parent, true, NULL);
}
return ret;
--
2.11.0
- [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
- [Qemu-block] [PATCH v4 02/15] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename(),
Alberto Garcia <=
- [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
- [Qemu-block] [PATCH v4 14/15] block: Remove assertions from update_flags_from_options(), Alberto Garcia, 2018/11/07