From patchwork Mon Dec 1 20:30:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 416565 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 4FB4014019D for ; Tue, 2 Dec 2014 07:36:16 +1100 (AEDT) Received: from localhost ([::1]:33791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvXhe-00023j-I3 for incoming@patchwork.ozlabs.org; Mon, 01 Dec 2014 15:36:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvXca-0001gC-Kr for qemu-devel@nongnu.org; Mon, 01 Dec 2014 15:31:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XvXcT-0007w8-5w for qemu-devel@nongnu.org; Mon, 01 Dec 2014 15:31:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvXcS-0007vg-Vr for qemu-devel@nongnu.org; Mon, 01 Dec 2014 15:30:53 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB1KUqCQ002445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 1 Dec 2014 15:30:52 -0500 Received: from dhcp-17-12.bos.redhat.com ([10.18.17.94]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sB1KUjBb027821; Mon, 1 Dec 2014 15:30:51 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Mon, 1 Dec 2014 15:30:11 -0500 Message-Id: <1417465816-19345-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1417465816-19345-1-git-send-email-jsnow@redhat.com> References: <1417465816-19345-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, Fam Zheng , John Snow , armbru@redhat.com, mreitz@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v9 05/10] block: Add bdrv_copy_dirty_bitmap and bdrv_reset_dirty_bitmap 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 Signed-off-by: Fam Zheng Signed-off-by: John Snow Reviewed-by: Max Reitz --- block.c | 35 +++++++++++++++++++++++++++++++---- include/block/block.h | 4 ++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index a0d1150..2d08b9f 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; }; @@ -5346,6 +5348,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 = 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_reset(bitmap->bitmap, 0, bitmap->size); +} + BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity, const char *name, @@ -5353,6 +5375,7 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, { int64_t bitmap_size; BdrvDirtyBitmap *bitmap; + int sector_granularity; assert((granularity & (granularity - 1)) == 0); @@ -5360,8 +5383,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"); @@ -5369,7 +5392,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; @@ -5441,7 +5466,9 @@ uint64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs) int64_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, diff --git a/include/block/block.h b/include/block/block.h index f180f93..5522eba 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -437,6 +437,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); uint64_t bdrv_dbm_calc_def_granularity(BlockDriverState *bs);