[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v4 11/13] qapi: add md5 checksum of last dirty b
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH RFC v4 11/13] qapi: add md5 checksum of last dirty bitmap level to query-block |
Date: |
Fri, 27 Feb 2015 20:24:49 +0300 |
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block.c | 1 +
include/qemu/hbitmap.h | 8 ++++++++
qapi/block-core.json | 4 +++-
util/hbitmap.c | 8 ++++++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 7b6251c..96bcc05 100644
--- a/block.c
+++ b/block.c
@@ -5604,6 +5604,7 @@ BlockDirtyInfoList
*bdrv_query_dirty_bitmaps(BlockDriverState *bs)
info->name = g_strdup(bm->name);
info->disabled = bm->disabled;
info->frozen = bdrv_dirty_bitmap_frozen(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 10ce05b..2fb748a 100644
--- a/include/qemu/hbitmap.h
+++ b/include/qemu/hbitmap.h
@@ -188,6 +188,14 @@ void hbitmap_deserialize_zeroes(HBitmap *hb, uint64_t
start, uint64_t count);
void hbitmap_deserialize_finish(HBitmap *hb);
/**
+ * 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 25dea80..2028d37 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -336,11 +336,13 @@
#
# @frozen: whether the dirty bitmap is frozen (Since 2.3)
#
+# @md5: md5 checksum of the last bitmap level (since 2.3)
+#
# Since: 1.3
##
{ 'type': 'BlockDirtyInfo',
'data': {'*name': 'str', 'count': 'int', 'granularity': 'uint32',
- 'disabled': 'bool', 'frozen': 'bool'} }
+ 'disabled': 'bool', 'frozen': 'bool', 'md5': 'str'} }
##
# @BlockInfo:
diff --git a/util/hbitmap.c b/util/hbitmap.c
index 1a123da..8de94eb 100644
--- a/util/hbitmap.c
+++ b/util/hbitmap.c
@@ -525,3 +525,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.9.1
- [Qemu-devel] [PATCH RFC v4 00/13] Dirty bitmaps migration, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 09/13] iotests: add add_incoming_migration to VM class, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 03/13] block: tiny refactoring: minimize hbitmap_(set/reset) usage, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 05/13] block: add bdrv_next_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 06/13] qapi: add dirty-bitmaps migration capability, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 11/13] qapi: add md5 checksum of last dirty bitmap level to query-block,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH RFC v4 02/13] block: BdrvDirtyBitmap serialization interface, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 12/13] iotests: add dirty bitmap migration test, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 08/13] iotests: maintain several vms in test, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 13/13] migration/qemu-file: make functions qemu_(get/put)_string public, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 04/13] block: add meta bitmaps, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 01/13] hbitmap: serialization, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 10/13] iotests: add event_wait to VM class, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 07/13] migration: add migration/block-dirty-bitmap.c, Vladimir Sementsov-Ogievskiy, 2015/02/27