From patchwork Wed Feb 18 14:00:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 440985 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9853B14008F for ; Thu, 19 Feb 2015 01:42:08 +1100 (AEDT) Received: from localhost ([::1]:51207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5pG-0008BW-Ke for incoming@patchwork.ozlabs.org; Wed, 18 Feb 2015 09:42:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5mp-00045e-6W for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO5ml-0001jX-Uy for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:35 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:48945 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO5ml-0001ix-J1 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 09:39:31 -0500 Received: from kvm.sw.ru ([10.30.16.253]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t1IE0U45024597; Wed, 18 Feb 2015 17:01:05 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 18 Feb 2015 17:00:12 +0300 Message-Id: <1424268014-13293-13-git-send-email-vsementsov@parallels.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424268014-13293-1-git-send-email-vsementsov@parallels.com> References: <1424268014-13293-1-git-send-email-vsementsov@parallels.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 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 Subject: [Qemu-devel] [PATCH RFC v3 12/14] qapi: add md5 checksum of last dirty bitmap level to query-block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow --- 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 4cca55d..9532ccc 100644 --- a/block.c +++ b/block.c @@ -5600,6 +5600,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 1a736e7..8063dce 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -523,3 +523,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); +}