From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPSGL-0008CK-Sc for qemu-devel@nongnu.org; Mon, 17 Mar 2014 03:47:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPSGF-0001fS-QI for qemu-devel@nongnu.org; Mon, 17 Mar 2014 03:47:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPSGF-0001fO-Ik for qemu-devel@nongnu.org; Mon, 17 Mar 2014 03:47:03 -0400 From: Fam Zheng Date: Mon, 17 Mar 2014 15:46:37 +0800 Message-Id: <1395042401-19291-6-git-send-email-famz@redhat.com> In-Reply-To: <1395042401-19291-1-git-send-email-famz@redhat.com> References: <1395042401-19291-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v3 5/9] hbitmap: Add hbitmap_copy 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 This makes a deep copy of an HBitmap. Signed-off-by: Fam Zheng --- include/qemu/hbitmap.h | 8 ++++++++ util/hbitmap.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h index 550d7ce..b645cfc 100644 --- a/include/qemu/hbitmap.h +++ b/include/qemu/hbitmap.h @@ -65,6 +65,14 @@ struct HBitmapIter { HBitmap *hbitmap_alloc(uint64_t size, int granularity); /** + * hbitmap_copy: + * @bitmap: The original bitmap to copy. + * + * Copy a HBitmap. + */ +HBitmap *hbitmap_copy(const HBitmap *bitmap); + +/** * hbitmap_empty: * @hb: HBitmap to operate on. * diff --git a/util/hbitmap.c b/util/hbitmap.c index d936831..d906c06 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -400,3 +400,19 @@ HBitmap *hbitmap_alloc(uint64_t size, int granularity) hb->levels[0][0] |= 1UL << (BITS_PER_LONG - 1); return hb; } + +HBitmap *hbitmap_copy(const HBitmap *bitmap) +{ + int i; + int64_t size; + HBitmap *hb = g_memdup(bitmap, sizeof(struct HBitmap)); + + size = bitmap->size; + for (i = HBITMAP_LEVELS; i-- > 0; ) { + size = MAX((size + BITS_PER_LONG - 1) >> BITS_PER_LEVEL, 1); + hb->levels[i] = g_memdup(bitmap->levels[i], + size * sizeof(unsigned long)); + } + + return hb; +} -- 1.9.0