From patchwork Tue Nov 25 19:46:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 414842 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 AAA3914010B for ; Wed, 26 Nov 2014 06:48:14 +1100 (AEDT) Received: from localhost ([::1]:59247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtM5s-0004kE-Rr for incoming@patchwork.ozlabs.org; Tue, 25 Nov 2014 14:48:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtM5B-0003Rn-Sy for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtM55-0004Hr-PF for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtM55-0004Hh-Gq for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:23 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAPJlMgd024465 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 25 Nov 2014 14:47:22 -0500 Received: from dhcp-17-12.bos.redhat.com (vpn-61-93.rdu2.redhat.com [10.10.61.93]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAPJlJWC024146; Tue, 25 Nov 2014 14:47:21 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Tue, 25 Nov 2014 14:46:33 -0500 Message-Id: <1416944800-17919-4-git-send-email-jsnow@redhat.com> In-Reply-To: <1416944800-17919-1-git-send-email-jsnow@redhat.com> References: <1416944800-17919-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: John Snow , Fam Zheng Subject: [Qemu-devel] [2.3 PATCH v7 03/10] block: Introduce bdrv_dirty_bitmap_granularity() 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 From: Fam Zheng This returns the granularity (in bytes) of dirty bitmap, which matches the QMP interface and the existing query interface. Signed-off-by: Fam Zheng Reviewed-by: Benoit Canet Signed-off-by: John Snow Reviewed-by: Max Reitz --- block.c | 9 +++++++-- include/block/block.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index a940345..ea4c8d8 100644 --- a/block.c +++ b/block.c @@ -5364,8 +5364,7 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) BlockDirtyInfo *info = g_new0(BlockDirtyInfo, 1); BlockDirtyInfoList *entry = g_new0(BlockDirtyInfoList, 1); info->count = bdrv_get_dirty_count(bs, bm); - info->granularity = - ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bm->bitmap)); + info->granularity = bdrv_dirty_bitmap_granularity(bs, bm); info->has_name = !!bm->name; info->name = g_strdup(bm->name); entry->value = info; @@ -5404,6 +5403,12 @@ int64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs) return granularity; } +int64_t bdrv_dirty_bitmap_granularity(BlockDriverState *bs, + BdrvDirtyBitmap *bitmap) +{ + return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap); +} + void bdrv_dirty_iter_init(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, HBitmapIter *hbi) { diff --git a/include/block/block.h b/include/block/block.h index feb84e2..9a62bce 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -438,6 +438,8 @@ void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs); int64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs); +int64_t bdrv_dirty_bitmap_granularity(BlockDriverState *bs, + BdrvDirtyBitmap *bitmap); int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t sector); void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors);