[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/22] qapi: add md5 checksum of last dirty bitmap l
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 05/22] qapi: add md5 checksum of last dirty bitmap level to query-block |
Date: |
Tue, 15 Mar 2016 23:04:11 +0300 |
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/dirty-bitmap.c | 1 +
include/qemu/hbitmap.h | 8 ++++++++
qapi/block-core.json | 5 ++++-
util/hbitmap.c | 8 ++++++++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 88d7967..e68c177 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -287,6 +287,7 @@ BlockDirtyInfoList
*bdrv_query_dirty_bitmaps(BlockDriverState *bs)
info->has_name = !!bm->name;
info->name = g_strdup(bm->name);
info->status = bdrv_dirty_bitmap_status(bm);
+ info->md5 = hbitmap_md5(bm->bitmap);
entry->value = info;
*plist = entry;
plist = &entry->next;
diff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h
index e29188c..6d1da4d 100644
--- a/include/qemu/hbitmap.h
+++ b/include/qemu/hbitmap.h
@@ -146,6 +146,14 @@ void hbitmap_reset_all(HBitmap *hb);
bool hbitmap_get(const HBitmap *hb, uint64_t item);
/**
+ * hbitmap_md5:
+ * @bitmap: HBitmap to operate on.
+ *
+ * Returns md5 checksum of the last level.
+ */
+char *hbitmap_md5(const HBitmap *bitmap);
+
+/**
* hbitmap_free:
* @hb: HBitmap to operate on.
*
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 9bf1b22..11b0aed 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -414,11 +414,14 @@
#
# @status: current status of the dirty bitmap (since 2.4)
#
+# @md5: md5 checksum (as a hexadecimal string) of the last bitmap level
+# (since 2.6)
+#
# Since: 1.3
##
{ 'struct': 'BlockDirtyInfo',
'data': {'*name': 'str', 'count': 'int', 'granularity': 'uint32',
- 'status': 'DirtyBitmapStatus'} }
+ 'status': 'DirtyBitmapStatus', 'md5': 'str'} }
##
# @BlockInfo:
diff --git a/util/hbitmap.c b/util/hbitmap.c
index b22b87d..28595fb 100644
--- a/util/hbitmap.c
+++ b/util/hbitmap.c
@@ -491,3 +491,11 @@ bool hbitmap_merge(HBitmap *a, const HBitmap *b)
return true;
}
+
+char *hbitmap_md5(const HBitmap *bitmap)
+{
+ uint64_t size =
+ MAX((bitmap->size + BITS_PER_LONG - 1) >> BITS_PER_LEVEL, 1);
+ const guchar *data = (const guchar *)bitmap->levels[HBITMAP_LEVELS - 1];
+ return g_compute_checksum_for_data(G_CHECKSUM_MD5, data, size);
+}
--
1.8.3.1
- [Qemu-devel] [PATCH v5 00/22] qcow2: persistent dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-devel] [PATCH 02/22] block: fix bdrv_dirty_bitmap_granularity signature, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-devel] [PATCH 01/22] block: Add two dirty bitmap getters, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-devel] [PATCH 05/22] qapi: add md5 checksum of last dirty bitmap level to query-block,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 04/22] iotests: add default node-name, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-devel] [PATCH 03/22] iotests: maintain several vms in test, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-devel] [PATCH 07/22] qcow2: Bitmaps extension: structs and consts, Vladimir Sementsov-Ogievskiy, 2016/03/15
- [Qemu-devel] [PATCH 06/22] hbitmap: load/store, Vladimir Sementsov-Ogievskiy, 2016/03/15