From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WT6Kx-00043b-NY for qemu-devel@nongnu.org; Thu, 27 Mar 2014 05:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WT6Kr-0001oN-Mf for qemu-devel@nongnu.org; Thu, 27 Mar 2014 05:10:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WT6Kr-0001oF-Ce for qemu-devel@nongnu.org; Thu, 27 Mar 2014 05:10:53 -0400 From: Fam Zheng Date: Thu, 27 Mar 2014 17:09:45 +0800 Message-Id: <1395911388-31027-7-git-send-email-famz@redhat.com> In-Reply-To: <1395911388-31027-1-git-send-email-famz@redhat.com> References: <1395911388-31027-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 6/9] 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 , Paolo Bonzini , Benoit Canet , Stefan Hajnoczi Signed-off-by: Fam Zheng --- block.c | 30 ++++++++++++++++++++++++++++-- include/block/block.h | 4 ++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 6b82bf0..0abc593 100644 --- a/block.c +++ b/block.c @@ -52,6 +52,8 @@ struct BdrvDirtyBitmap { HBitmap *bitmap; + int64_t size; + int64_t granularity; char *name; QLIST_ENTRY(BdrvDirtyBitmap) list; }; @@ -5097,6 +5099,29 @@ 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_memdup(bitmap, sizeof(BdrvDirtyBitmap)); + new_bitmap->bitmap = hbitmap_copy(bitmap->bitmap); + if (name) { + new_bitmap->name = g_strdup(name); + } + QLIST_INSERT_HEAD(&bs->dirty_bitmaps, new_bitmap, list); + return new_bitmap; +} + +void bdrv_reset_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) +{ + HBitmap *original = bitmap->bitmap; + + bitmap->bitmap = hbitmap_alloc(bitmap->size, bitmap->granularity); + hbitmap_free(original); +} + BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity, const char *name, @@ -5118,9 +5143,10 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, error_setg(errp, "could not get length of device"); return NULL; } - bitmap_size >>= BDRV_SECTOR_BITS; bitmap = g_malloc0(sizeof(BdrvDirtyBitmap)); - bitmap->bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1); + bitmap->size = bitmap_size >> BDRV_SECTOR_BITS; + 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 ed85f85..a29169f 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -435,6 +435,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.1