[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 15/21] qcow2: add .bdrv_can_store_dirty_bitmap
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 15/21] qcow2: add .bdrv_can_store_dirty_bitmap |
Date: |
Tue, 22 Nov 2016 20:26:20 +0300 |
Realize .bdrv_can_store_dirty_bitmap interface.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2-bitmap.c | 40 ++++++++++++++++++++++++++++++++++++++++
block/qcow2.c | 1 +
block/qcow2.h | 4 ++++
3 files changed, 45 insertions(+)
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index a975388..55b1112 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -1115,3 +1115,43 @@ fail:
bitmap_list_free(bm_list);
}
+
+bool qcow2_can_store_dirty_bitmap(BlockDriverState *bs,
+ const char *name,
+ uint32_t granularity,
+ Error **errp)
+{
+ BDRVQcow2State *s = bs->opaque;
+ const char *reason = NULL;
+ bool found;
+ Qcow2BitmapList *bm_list;
+
+ if (check_constraints_on_bitmap(bs, name, granularity) != 0) {
+ reason = "it doesn't satisfy the constraints";
+ goto common_errp;
+ }
+
+ if (s->nb_bitmaps == 0) {
+ return true;
+ }
+
+ bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
+ s->bitmap_directory_size, errp);
+ if (bm_list == NULL) {
+ return false;
+ }
+
+ found = !!find_bitmap_by_name(bm_list, name);
+ bitmap_list_free(bm_list);
+ if (found) {
+ reason = "bitmap with the same name is already stored";
+ goto common_errp;
+ }
+
+ return true;
+
+common_errp:
+ error_setg(errp, "Can't make bitmap '%s' persistent in '%s', as %s.",
+ name, bdrv_get_device_or_node_name(bs), reason);
+ return false;
+}
diff --git a/block/qcow2.c b/block/qcow2.c
index 66c7f74..cb9c2a2 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3516,6 +3516,7 @@ BlockDriver bdrv_qcow2 = {
.bdrv_load_autoloading_dirty_bitmaps =
qcow2_load_autoloading_dirty_bitmaps,
.bdrv_store_persistent_dirty_bitmaps =
qcow2_store_persistent_dirty_bitmaps,
+ .bdrv_can_store_dirty_bitmap = qcow2_can_store_dirty_bitmap,
};
static void bdrv_qcow2_init(void)
diff --git a/block/qcow2.h b/block/qcow2.h
index d9a7643..e7a44a1 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -616,5 +616,9 @@ void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c,
void **table);
/* qcow2-bitmap.c functions */
void qcow2_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp);
void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **errp);
+bool qcow2_can_store_dirty_bitmap(BlockDriverState *bs,
+ const char *name,
+ uint32_t granularity,
+ Error **errp);
#endif
--
1.8.3.1
- [Qemu-block] [PATCH 03/21] hbitmap: improve dirty iter, (continued)
- [Qemu-block] [PATCH 03/21] hbitmap: improve dirty iter, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 04/21] tests: add hbitmap iter test, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 01/21] specs/qcow2: fix bitmap granularity qemu-specific note, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 02/21] specs/qcow2: do not use wording 'bitmap header', Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 12/21] block/dirty-bitmap: add bdrv_dirty_bitmap_next(), Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 21/21] qcow2-bitmap: refcounts, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 07/21] qcow2: add bitmaps extension, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 18/21] qmp: add x-debug-block-dirty-bitmap-sha256, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 13/21] qcow2: add .bdrv_store_persistent_dirty_bitmaps(), Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 19/21] iotests: test qcow2 persistent dirty bitmap, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 15/21] qcow2: add .bdrv_can_store_dirty_bitmap,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 05/21] block: fix bdrv_dirty_bitmap_granularity signature, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 17/21] qmp: add autoload parameter to block-dirty-bitmap-add, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 16/21] qmp: add persistent flag to block-dirty-bitmap-add, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 10/21] block/dirty-bitmap: add autoload field to BdrvDirtyBitmap, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 20/21] qcow2-refcount: rename inc_refcounts() and make it public, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 06/21] block/dirty-bitmap: add deserialize_ones func, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 11/21] block: introduce persistent dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/11/22
- [Qemu-block] [PATCH 09/21] qcow2: add .bdrv_load_autoloading_dirty_bitmaps, Vladimir Sementsov-Ogievskiy, 2016/11/22