[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 079/100] block: introduce persistent dirty bitmaps
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 079/100] block: introduce persistent dirty bitmaps |
Date: |
Fri, 7 Jul 2017 19:08:34 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
New field BdrvDirtyBitmap.persistent means, that bitmap should be saved
by format driver in .bdrv_close and .bdrv_inactivate. No format driver
supports it for now.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
[mreitz: Fixed indentation]
Signed-off-by: Max Reitz <address@hidden>
---
block/dirty-bitmap.c | 29 +++++++++++++++++++++++++++++
block/qcow2-bitmap.c | 1 +
include/block/dirty-bitmap.h | 4 ++++
3 files changed, 34 insertions(+)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 06dc7a3..3c17c45 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -54,6 +54,7 @@ struct BdrvDirtyBitmap {
this flag is set. */
bool autoload; /* For persistent bitmaps: bitmap must be
autoloaded on image opening */
+ bool persistent; /* bitmap must be saved to owner disk image */
QLIST_ENTRY(BdrvDirtyBitmap) list;
};
@@ -102,6 +103,7 @@ void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap)
assert(!bdrv_dirty_bitmap_frozen(bitmap));
g_free(bitmap->name);
bitmap->name = NULL;
+ bitmap->persistent = false;
bitmap->autoload = false;
}
@@ -299,6 +301,8 @@ BdrvDirtyBitmap
*bdrv_dirty_bitmap_abdicate(BlockDriverState *bs,
bitmap->name = NULL;
successor->name = name;
bitmap->successor = NULL;
+ successor->persistent = bitmap->persistent;
+ bitmap->persistent = false;
successor->autoload = bitmap->autoload;
bitmap->autoload = false;
bdrv_release_dirty_bitmap(bs, bitmap);
@@ -689,3 +693,28 @@ bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap
*bitmap)
{
return bitmap->autoload;
}
+
+/* Called with BQL taken. */
+void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap, bool
persistent)
+{
+ qemu_mutex_lock(bitmap->mutex);
+ bitmap->persistent = persistent;
+ qemu_mutex_unlock(bitmap->mutex);
+}
+
+bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap)
+{
+ return bitmap->persistent;
+}
+
+bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs)
+{
+ BdrvDirtyBitmap *bm;
+ QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) {
+ if (bm->persistent && !bm->readonly) {
+ return true;
+ }
+ }
+
+ return false;
+}
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index ee6d8f7..52e4616 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -794,6 +794,7 @@ bool qcow2_load_autoloading_dirty_bitmaps(BlockDriverState
*bs, Error **errp)
goto fail;
}
+ bdrv_dirty_bitmap_set_persistance(bitmap, true);
bdrv_dirty_bitmap_set_autoload(bitmap, true);
bm->flags |= BME_FLAG_IN_USE;
created_dirty_bitmaps =
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index e2fea12..bdf43df 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -73,6 +73,8 @@ void bdrv_dirty_bitmap_deserialize_finish(BdrvDirtyBitmap
*bitmap);
void bdrv_dirty_bitmap_set_readonly(BdrvDirtyBitmap *bitmap, bool value);
void bdrv_dirty_bitmap_set_autoload(BdrvDirtyBitmap *bitmap, bool autoload);
+void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap,
+ bool persistent);
/* Functions that require manual locking. */
void bdrv_dirty_bitmap_lock(BdrvDirtyBitmap *bitmap);
@@ -91,5 +93,7 @@ void bdrv_dirty_bitmap_truncate(BlockDriverState *bs);
bool bdrv_dirty_bitmap_readonly(const BdrvDirtyBitmap *bitmap);
bool bdrv_has_readonly_bitmaps(BlockDriverState *bs);
bool bdrv_dirty_bitmap_get_autoload(const BdrvDirtyBitmap *bitmap);
+bool bdrv_dirty_bitmap_get_persistance(BdrvDirtyBitmap *bitmap);
+bool bdrv_has_changed_persistent_bitmaps(BlockDriverState *bs);
#endif
--
1.8.3.1
- [Qemu-block] [PULL 069/100] qcow2-refcount: rename inc_refcounts() and make it public, (continued)
- [Qemu-block] [PULL 069/100] qcow2-refcount: rename inc_refcounts() and make it public, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 071/100] block/dirty-bitmap: fix comment for BlockDirtyBitmap.disabled field, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 072/100] block/dirty-bitmap: add readonly field to BdrvDirtyBitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 070/100] qcow2: add bitmaps extension, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 074/100] block: refactor bdrv_reopen_commit, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 073/100] qcow2: autoloading dirty bitmaps, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 078/100] block: bdrv_close: release bitmaps after drv->bdrv_close, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 075/100] block: new bdrv_reopen_bitmaps_rw interface, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 077/100] block/dirty-bitmap: add autoload field to BdrvDirtyBitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 076/100] qcow2: support .bdrv_reopen_bitmaps_rw, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 079/100] block: introduce persistent dirty bitmaps,
Kevin Wolf <=
- [Qemu-block] [PULL 082/100] qcow2: store bitmaps on reopening image as read-only, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 080/100] block/dirty-bitmap: add bdrv_dirty_bitmap_next(), Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 081/100] qcow2: add persistent dirty bitmaps support, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 083/100] block: add bdrv_can_store_new_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 087/100] qmp: add x-debug-block-dirty-bitmap-sha256, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 084/100] qcow2: add .bdrv_can_store_new_dirty_bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 086/100] qmp: add autoload parameter to block-dirty-bitmap-add, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 088/100] iotests: test qcow2 persistent dirty bitmap, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 085/100] qmp: add persistent flag to block-dirty-bitmap-add, Kevin Wolf, 2017/07/07
- [Qemu-block] [PULL 089/100] block/dirty-bitmap: add bdrv_remove_persistent_dirty_bitmap, Kevin Wolf, 2017/07/07