From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwXkd-0004s7-D7 for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:57:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwXiY-0003CL-Dt for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:55:59 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:36687 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwXiY-00037z-0j for qemu-devel@nongnu.org; Wed, 11 Nov 2015 10:53:50 -0500 From: Vladimir Sementsov-Ogievskiy Date: Wed, 11 Nov 2015 18:16:41 +0300 Message-Id: <1447255003-2043-12-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1447255003-2043-1-git-send-email-vsementsov@virtuozzo.com> References: <1447255003-2043-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 11/13] qapi: add md5 checksum of last dirty bitmap level to query-block List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, vsementsov@virtuozzo.com, quintela@redhat.com, dgilbert@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, amit.shah@redhat.com, den@openvz.org, jsnow@redhat.com Reviewed-by: John Snow Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.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.c b/block.c index 8863034..5eeb4e1 100644 --- a/block.c +++ b/block.c @@ -3376,6 +3376,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 0a37dbf..5c5a898 100644 --- a/include/qemu/hbitmap.h +++ b/include/qemu/hbitmap.h @@ -222,6 +222,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 425fdab..ee21d8b 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -360,11 +360,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 22276a6..1dc91b8 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -607,3 +607,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