[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/17] block: store persistent dirty bitmaps
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 08/17] block: store persistent dirty bitmaps |
Date: |
Wed, 17 Feb 2016 18:29:00 +0300 |
Persistent dirty bitmaps are the bitmaps, for which the new field
BdrvDirtyBitmap.file is not NULL. We save all persistent dirty bitmaps
owned by BlockDriverState in corresponding bdrv_close().
BdrvDirtyBitmap.file is a BlockDriverState, where we want to save the
bitmap. It may be set in bdrv_dirty_bitmap_set_file() only once.
bdrv_ref/bdrv_unref are used for BdrvDirtyBitmap.file to be sure that
files will be closed and resources will be freed.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block.c | 3 +++
block/dirty-bitmap.c | 35 +++++++++++++++++++++++++++++++++++
include/block/dirty-bitmap.h | 5 +++++
3 files changed, 43 insertions(+)
diff --git a/block.c b/block.c
index afb71c0..ce76f2e 100644
--- a/block.c
+++ b/block.c
@@ -2143,6 +2143,9 @@ void bdrv_close(BlockDriverState *bs)
blk_dev_change_media_cb(bs->blk, false);
}
+ /* save and release persistent dirty bitmaps */
+ bdrv_finalize_persistent_dirty_bitmaps(bs);
+
if (bs->drv) {
BdrvChild *child, *next;
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 115efb8..0876c38 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -43,6 +43,7 @@ struct BdrvDirtyBitmap {
int64_t size; /* Size of the bitmap (Number of sectors) */
bool disabled; /* Bitmap is read-only */
int active_iterators; /* How many iterators are active */
+ bool internal_persistent; /* bitmap must be saved to owner disk image */
QLIST_ENTRY(BdrvDirtyBitmap) list;
};
@@ -529,3 +530,37 @@ bool bdrv_load_check_dirty_bitmap(BlockDriverState *file,
const char *name)
}
return false;
}
+
+void bdrv_store_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,
+ Error **errp)
+{
+ if (bs == NULL || bs->drv == NULL ||
+ bs->drv->bdrv_dirty_bitmap_store == NULL) {
+ error_setg(errp, "Storing bitmap is unsupported for the format.");
+ return;
+ }
+
+ bs->drv->bdrv_dirty_bitmap_store(bs, bitmap, errp);
+}
+
+void bdrv_dirty_bitmap_set_internal_persistance(BdrvDirtyBitmap *bitmap,
+ bool persistent)
+{
+ bitmap->internal_persistent = persistent;
+}
+
+void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState *bs)
+{
+ BdrvDirtyBitmap *bm, *bm_next;
+
+ QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, bm_next) {
+ if (bm->internal_persistent) {
+ Error *local_err = NULL;
+ bdrv_store_dirty_bitmap(bs, bm, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ }
+ bdrv_release_dirty_bitmap(bs, bm);
+ }
+ }
+}
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 5d8c2c1..a4f13f1 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -79,5 +79,10 @@ int bdrv_dirty_bitmap_store(const BdrvDirtyBitmap *bitmap,
BlockDriverState *bs,
const uint64_t *table, uint32_t table_size,
uint32_t cluster_size);
bool bdrv_load_check_dirty_bitmap(BlockDriverState *file, const char *name);
+void bdrv_dirty_bitmap_set_internal_persistance(BdrvDirtyBitmap *bitmap,
+ bool persistent);
+void bdrv_store_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,
+ Error **errp);
+void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState *bs);
#endif
--
1.8.3.1
- [Qemu-devel] [PATCH v4 RFC 00/17] qcow2: persistent dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 02/17] qcow2: Bitmaps extension: structs and consts, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 01/17] hbitmap: load/store, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 04/17] qcow2-dirty-bitmap: add qcow2_bitmap_load(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 06/17] qcow2: add dirty bitmaps extension, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 07/17] qcow2-dirty-bitmap: add qcow2_bitmap_load_check(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 03/17] qcow2-dirty-bitmap: read dirty bitmap directory, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 05/17] qcow2-dirty-bitmap: add qcow2_bitmap_store(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 08/17] block: store persistent dirty bitmaps,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 10/17] qcow2-dirty-bitmap: add autoclear bit, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 09/17] block: add bdrv_load_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 11/17] qemu: command line option for dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 12/17] qcow2-dirty-bitmap: add IN_USE flag, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 13/17] qcow2-dirty-bitmaps: disallow stroing bitmap to other bs, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 16/17] qcow2-dirty-bitmap: add AUTO flag, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 14/17] iotests: add VM.test_launcn(), Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 17/17] qcow2-dirty-bitmap: add EXTRA_DATA_COMPATIBLE flag, Vladimir Sementsov-Ogievskiy, 2016/02/17
- [Qemu-devel] [PATCH 15/17] iotests: test internal persistent dirty bitmap, Vladimir Sementsov-Ogievskiy, 2016/02/17
- Re: [Qemu-devel] [PATCH v4 RFC 00/17] qcow2: persistent dirty bitmaps, John Snow, 2016/02/26