From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtgbj-0006jk-TG for qemu-devel@nongnu.org; Wed, 26 Nov 2014 12:42:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtgbU-0004ZF-SD for qemu-devel@nongnu.org; Wed, 26 Nov 2014 12:42:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtgbU-0004ZA-Jr for qemu-devel@nongnu.org; Wed, 26 Nov 2014 12:42:12 -0500 From: John Snow Date: Wed, 26 Nov 2014 12:41:48 -0500 Message-Id: <1417023715-18210-4-git-send-email-jsnow@redhat.com> In-Reply-To: <1417023715-18210-1-git-send-email-jsnow@redhat.com> References: <1417023715-18210-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v8 03/10] block: Introduce bdrv_dirty_bitmap_granularity() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Fam Zheng , John Snow , armbru@redhat.com, mreitz@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, pbonzini@redhat.com 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 Signed-off-by: John Snow --- block.c | 9 +++++++-- include/block/block.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index c794316..c851a03 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 @@ uint64_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 3579e7f..c3daa19 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); uint64_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); -- 1.9.3