[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 04/15] block: Use bdrv_reopen_set_read_only() in
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH v4 04/15] block: Use bdrv_reopen_set_read_only() in bdrv_commit() |
Date: |
Wed, 7 Nov 2018 14:59:39 +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/commit.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index a53c2d04b0..53148e610b 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -391,7 +391,7 @@ int bdrv_commit(BlockDriverState *bs)
BlockDriverState *commit_top_bs = NULL;
BlockDriver *drv = bs->drv;
int64_t offset, length, backing_length;
- int ro, open_flags;
+ int ro;
int64_t n;
int ret = 0;
uint8_t *buf = NULL;
@@ -410,10 +410,9 @@ int bdrv_commit(BlockDriverState *bs)
}
ro = bs->backing->bs->read_only;
- open_flags = bs->backing->bs->open_flags;
if (ro) {
- if (bdrv_reopen(bs->backing->bs, open_flags | BDRV_O_RDWR, NULL)) {
+ if (bdrv_reopen_set_read_only(bs->backing->bs, false, NULL)) {
return -EACCES;
}
}
@@ -523,7 +522,7 @@ ro_cleanup:
if (ro) {
/* ignoring error return here */
- bdrv_reopen(bs->backing->bs, open_flags & ~BDRV_O_RDWR, NULL);
+ bdrv_reopen_set_read_only(bs->backing->bs, 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 <=
- [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, 2018/11/07
- [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