[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/12] qapi: add md5 checksum of last dirty bitmap l
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 11/12] qapi: add md5 checksum of last dirty bitmap level to query-block |
Date: |
Fri, 7 Aug 2015 12:32:43 +0300 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
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 d9da767..4f7fc0d 100644
--- a/block.c
+++ b/block.c
@@ -3543,6 +3543,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 1da5b35..d8e1c7c 100644
--- a/include/qemu/hbitmap.h
+++ b/include/qemu/hbitmap.h
@@ -208,6 +208,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 7b2efb8..d1e68fd 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -359,11 +359,13 @@
#
# @status: current status of the dirty bitmap (since 2.4)
#
+# @md5: md5 checksum of the last bitmap level (since 2.4)
+#
# 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 c7c21fe..def04b0 100644
--- a/util/hbitmap.c
+++ b/util/hbitmap.c
@@ -591,3 +591,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);
+}
--
2.1.4
- [Qemu-devel] [PATCH 01/12] hbitmap: serialization, (continued)
- [Qemu-devel] [PATCH 01/12] hbitmap: serialization, Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 04/12] block: add meta bitmaps, Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 03/12] block: tiny refactoring: minimize hbitmap_(set/reset) usage, Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 05/12] block: add bdrv_next_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 06/12] qapi: add dirty-bitmaps migration capability, Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 07/12] migration/qemu-file: add qemu_put_counted_string(), Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 09/12] iotests: maintain several vms in test, Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 10/12] iotests: add add_incoming_migration to VM class, Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 08/12] migration: add migration/block-dirty-bitmap.c, Vladimir Sementsov-Ogievskiy, 2015/08/07
- [Qemu-devel] [PATCH 11/12] qapi: add md5 checksum of last dirty bitmap level to query-block,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 12/12] iotests: add dirty bitmap migration test, Vladimir Sementsov-Ogievskiy, 2015/08/07
- Re: [Qemu-devel] [PATCH v6 00/12] Dirty bitmaps migration, Vladimir Sementsov-Ogievskiy, 2015/08/07