From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjgKu-0000rU-Ku for qemu-devel@nongnu.org; Wed, 29 Oct 2014 23:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XjgKo-0002PJ-Ex for qemu-devel@nongnu.org; Wed, 29 Oct 2014 23:23:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjgKo-0002P5-7y for qemu-devel@nongnu.org; Wed, 29 Oct 2014 23:23:38 -0400 From: Fam Zheng Date: Thu, 30 Oct 2014 11:22:39 +0800 Message-Id: <1414639364-4499-6-git-send-email-famz@redhat.com> In-Reply-To: <1414639364-4499-1-git-send-email-famz@redhat.com> References: <1414639364-4499-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v6 05/10] block: Add bdrv_copy_dirty_bitmap and bdrv_reset_dirty_bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Benoit Canet , Vladimir Sementsov-Ogievskij , Markus Armbruster , Max Reitz , John Snow , Stefan Hajnoczi , Jd , Paolo Bonzini , Luiz Capitulino Signed-off-by: Fam Zheng --- block.c | 26 +++++++++++++++++++++++++- include/block/block.h | 4 ++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 1b12541..39381cd 100644 --- a/block.c +++ b/block.c @@ -53,6 +53,8 @@ struct BdrvDirtyBitmap { HBitmap *bitmap; + int64_t size; + int granularity; char *name; QLIST_ENTRY(BdrvDirtyBitmap) list; }; @@ -5280,6 +5282,26 @@ void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) bitmap->name = NULL; } +BdrvDirtyBitmap *bdrv_copy_dirty_bitmap(BlockDriverState *bs, + const BdrvDirtyBitmap *bitmap, + const char *name) +{ + BdrvDirtyBitmap *new_bitmap; + + new_bitmap = g_malloc0(sizeof(BdrvDirtyBitmap)); + new_bitmap->bitmap = hbitmap_copy(bitmap->bitmap); + new_bitmap->size = bitmap->size; + new_bitmap->granularity = bitmap->granularity; + new_bitmap->name = name ? g_strdup(name) : NULL; + QLIST_INSERT_HEAD(&bs->dirty_bitmaps, new_bitmap, list); + return new_bitmap; +} + +void bdrv_reset_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) +{ + hbitmap_reset(bitmap->bitmap, 0, bitmap->size); +} + BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity, const char *name, @@ -5303,7 +5325,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 = ffs(granularity) - 1; + bitmap->bitmap = hbitmap_alloc(bitmap->size, bitmap->granularity); if (name) { bitmap->name = g_strdup(name); } diff --git a/include/block/block.h b/include/block/block.h index 87fa48e..c5a3aa6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -426,6 +426,10 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, const char *name); void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); +void bdrv_reset_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); +BdrvDirtyBitmap *bdrv_copy_dirty_bitmap(BlockDriverState *bs, + const BdrvDirtyBitmap *bitmap, + const char *name); void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs); int bdrv_dirty_bitmap_granularity(BlockDriverState *bs, -- 1.9.3