[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 35/85] block: new bdrv_reopen_bitmaps_rw interface
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 35/85] block: new bdrv_reopen_bitmaps_rw interface |
Date: |
Tue, 11 Jul 2017 18:07:24 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Add format driver handler, which should mark loaded read-only
bitmaps as 'IN_USE' in the image and unset read_only field in
corresponding BdrvDirtyBitmap's.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
include/block/block_int.h | 7 +++++++
block.c | 19 +++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index b9069c5..254f860 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -381,6 +381,13 @@ struct BlockDriver {
uint64_t parent_perm, uint64_t parent_shared,
uint64_t *nperm, uint64_t *nshared);
+ /**
+ * Bitmaps should be marked as 'IN_USE' in the image on reopening image
+ * as rw. This handler should realize it. It also should unset readonly
+ * field of BlockDirtyBitmap's in case of success.
+ */
+ int (*bdrv_reopen_bitmaps_rw)(BlockDriverState *bs, Error **errp);
+
QLIST_ENTRY(BlockDriver) list;
};
diff --git a/block.c b/block.c
index 15a4e75..3ec6624 100644
--- a/block.c
+++ b/block.c
@@ -2983,12 +2983,16 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
{
BlockDriver *drv;
BlockDriverState *bs;
+ bool old_can_write, new_can_write;
assert(reopen_state != NULL);
bs = reopen_state->bs;
drv = bs->drv;
assert(drv != NULL);
+ old_can_write =
+ !bdrv_is_read_only(bs) && !(bdrv_get_flags(bs) & BDRV_O_INACTIVE);
+
/* If there are any driver level actions to take */
if (drv->bdrv_reopen_commit) {
drv->bdrv_reopen_commit(reopen_state);
@@ -3002,6 +3006,21 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
bdrv_refresh_limits(bs, NULL);
+
+ new_can_write =
+ !bdrv_is_read_only(bs) && !(bdrv_get_flags(bs) & BDRV_O_INACTIVE);
+ if (!old_can_write && new_can_write && drv->bdrv_reopen_bitmaps_rw) {
+ Error *local_err = NULL;
+ if (drv->bdrv_reopen_bitmaps_rw(bs, &local_err) < 0) {
+ /* This is not fatal, bitmaps just left read-only, so all following
+ * writes will fail. User can remove read-only bitmaps to unblock
+ * writes.
+ */
+ error_reportf_err(local_err,
+ "%s: Failed to make dirty bitmaps writable: ",
+ bdrv_get_node_name(bs));
+ }
+ }
}
/*
--
2.9.4
- [Qemu-block] [PULL 25/85] hbitmap: improve dirty iter, (continued)
- [Qemu-block] [PULL 25/85] hbitmap: improve dirty iter, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 26/85] tests: add hbitmap iter test, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 27/85] block: fix bdrv_dirty_bitmap_granularity signature, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 29/85] qcow2-refcount: rename inc_refcounts() and make it public, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 28/85] block/dirty-bitmap: add deserialize_ones func, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 30/85] qcow2: add bitmaps extension, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 31/85] block/dirty-bitmap: fix comment for BlockDirtyBitmap.disabled field, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 32/85] block/dirty-bitmap: add readonly field to BdrvDirtyBitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 34/85] block: refactor bdrv_reopen_commit, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 33/85] qcow2: autoloading dirty bitmaps, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 35/85] block: new bdrv_reopen_bitmaps_rw interface,
Max Reitz <=
- [Qemu-block] [PULL 38/85] block: bdrv_close: release bitmaps after drv->bdrv_close, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 37/85] block/dirty-bitmap: add autoload field to BdrvDirtyBitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 36/85] qcow2: support .bdrv_reopen_bitmaps_rw, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 39/85] block: introduce persistent dirty bitmaps, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 40/85] block/dirty-bitmap: add bdrv_dirty_bitmap_next(), Max Reitz, 2017/07/11
- [Qemu-block] [PULL 41/85] qcow2: add persistent dirty bitmaps support, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 42/85] qcow2: store bitmaps on reopening image as read-only, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 44/85] qcow2: add .bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 43/85] block: add bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11
- [Qemu-block] [PULL 45/85] qmp: add persistent flag to block-dirty-bitmap-add, Max Reitz, 2017/07/11