From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtM5E-0003UR-4Y for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtM55-0004Hl-IE for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtM55-0004Hf-B2 for qemu-devel@nongnu.org; Tue, 25 Nov 2014 14:47:23 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAPJlMmP006974 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 25 Nov 2014 14:47:22 -0500 From: John Snow Date: Tue, 25 Nov 2014 14:46:34 -0500 Message-Id: <1416944800-17919-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1416944800-17919-1-git-send-email-jsnow@redhat.com> References: <1416944800-17919-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [2.3 PATCH v7 04/10] hbitmap: Add hbitmap_copy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: John Snow , Fam Zheng From: Fam Zheng This makes a deep copy of an HBitmap. Signed-off-by: Fam Zheng Signed-off-by: John Snow --- 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 b3060e6..eddc05b 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -395,3 +395,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; + uint64_t size; + HBitmap *hb = g_memdup(bitmap, sizeof(HBitmap)); + + size = bitmap->size; + for (i = HBITMAP_LEVELS; i >= 0; i--) { + 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.3