From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7i-0008Fz-Tq for qemu-devel@nongnu.org; Wed, 13 May 2015 12:03:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsZ7f-0005tt-Hp for qemu-devel@nongnu.org; Wed, 13 May 2015 12:03:06 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:30977 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7f-0005rh-1O for qemu-devel@nongnu.org; Wed, 13 May 2015 12:03:03 -0400 From: Vladimir Sementsov-Ogievskiy Date: Wed, 13 May 2015 18:30:05 +0300 Message-Id: <1431531007-10269-11-git-send-email-vsementsov@parallels.com> In-Reply-To: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> References: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> Subject: [Qemu-devel] [PATCH 10/12] 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, quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com, 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 | 4 +++- util/hbitmap.c | 8 ++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 4098a06..575584d 100644 --- a/block.c +++ b/block.c @@ -3283,6 +3283,7 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) info->has_name = !!bm->name; info->name = g_strdup(bm->name); 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 4c8e385..ba1a1c6 100644 --- a/include/qemu/hbitmap.h +++ b/include/qemu/hbitmap.h @@ -200,6 +200,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 863ffea..eb647e8 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -338,11 +338,13 @@ # # @frozen: whether the dirty bitmap is frozen (Since 2.4) # +# @md5: md5 checksum of the last bitmap level (since 2.3) +# # Since: 1.3 ## { 'struct': 'BlockDirtyInfo', 'data': {'*name': 'str', 'count': 'int', 'granularity': 'uint32', - 'frozen': 'bool'} } + 'frozen': 'bool', 'md5': 'str'} } ## # @BlockInfo: diff --git a/util/hbitmap.c b/util/hbitmap.c index 46296bc..83e596f 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -578,3 +578,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