From patchwork Wed Mar 12 06:31:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 329329 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 99A0E2C00B8 for ; Wed, 12 Mar 2014 17:42:23 +1100 (EST) Received: from localhost ([::1]:58928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNcly-0002Gm-AJ for incoming@patchwork.ozlabs.org; Wed, 12 Mar 2014 02:36:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNchH-0003vL-NB for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNchB-0000T1-Ny for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62475) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNchB-0000Sw-GF for qemu-devel@nongnu.org; Wed, 12 Mar 2014 02:31:17 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2C6VG7k001051 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Mar 2014 02:31:16 -0400 Received: from T430.nay.redhat.com ([10.66.6.152]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s2C6UoeF024513; Wed, 12 Mar 2014 02:31:13 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 12 Mar 2014 14:31:01 +0800 Message-Id: <1394605864-32237-7-git-send-email-famz@redhat.com> In-Reply-To: <1394605864-32237-1-git-send-email-famz@redhat.com> References: <1394605864-32237-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 6/9] 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 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 26a43eb..199a465 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; }; @@ -5067,6 +5069,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, @@ -5088,9 +5113,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 b87c071..66aae57 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -444,6 +444,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,