From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAhtv-0000J4-St for qemu-devel@nongnu.org; Mon, 12 Jan 2015 11:31:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAhtr-0005Jf-2X for qemu-devel@nongnu.org; Mon, 12 Jan 2015 11:31:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAhtq-0005JT-Rf for qemu-devel@nongnu.org; Mon, 12 Jan 2015 11:31:31 -0500 From: John Snow Date: Mon, 12 Jan 2015 11:30:57 -0500 Message-Id: <1421080265-2228-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1421080265-2228-1-git-send-email-jsnow@redhat.com> References: <1421080265-2228-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v11 05/13] block: Add bdrv_clear_dirty_bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, John Snow , armbru@redhat.com, mreitz@redhat.com, vsementsov@parallels.com, stefanha@redhat.com Signed-off-by: Fam Zheng Signed-off-by: John Snow --- block.c | 24 ++++++++++++++++++++---- include/block/block.h | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index a1d9e88..7bf7079 100644 --- a/block.c +++ b/block.c @@ -53,6 +53,8 @@ struct BdrvDirtyBitmap { HBitmap *bitmap; + int64_t size; + int64_t granularity; char *name; QLIST_ENTRY(BdrvDirtyBitmap) list; }; @@ -5350,6 +5352,7 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, { int64_t bitmap_size; BdrvDirtyBitmap *bitmap; + int sector_granularity; assert((granularity & (granularity - 1)) == 0); @@ -5357,8 +5360,8 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, error_setg(errp, "Bitmap already exists: %s", name); return NULL; } - granularity >>= BDRV_SECTOR_BITS; - assert(granularity); + sector_granularity = granularity >> BDRV_SECTOR_BITS; + assert(sector_granularity); bitmap_size = bdrv_nb_sectors(bs); if (bitmap_size < 0) { error_setg_errno(errp, -bitmap_size, "could not get length of device"); @@ -5366,7 +5369,9 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, return NULL; } bitmap = g_new0(BdrvDirtyBitmap, 1); - bitmap->bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1); + bitmap->size = bitmap_size; + bitmap->granularity = granularity; + bitmap->bitmap = hbitmap_alloc(bitmap->size, ffs(sector_granularity) - 1); bitmap->name = g_strdup(name); QLIST_INSERT_HEAD(&bs->dirty_bitmaps, bitmap, list); return bitmap; @@ -5439,7 +5444,9 @@ uint64_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs) uint64_t bdrv_dirty_bitmap_granularity(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) { - return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap); + g_assert(BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap) == + bitmap->granularity); + return bitmap->granularity; } void bdrv_dirty_iter_init(BlockDriverState *bs, @@ -5460,6 +5467,15 @@ void bdrv_reset_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors); } +/** + * Effectively, reset the hbitmap from bits [0, size) + * Synonymous with bdrv_reset_dirty_bitmap(bs, bitmap, 0, bitmap->size) + */ +void bdrv_clear_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) +{ + hbitmap_reset(bitmap->bitmap, 0, bitmap->size); +} + static void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors) { diff --git a/include/block/block.h b/include/block/block.h index c7402e7..66f092a 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -446,6 +446,7 @@ void bdrv_set_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t cur_sector, int nr_sectors); void bdrv_reset_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t cur_sector, int nr_sectors); +void bdrv_clear_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); void bdrv_dirty_iter_init(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, struct HBitmapIter *hbi); int64_t bdrv_get_dirty_count(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); -- 1.9.3