From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKrlv-0004CS-Pv for qemu-devel@nongnu.org; Fri, 22 Aug 2014 12:33:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKrlo-0004Vw-DW for qemu-devel@nongnu.org; Fri, 22 Aug 2014 12:33:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11464) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKrlo-0004Vq-3y for qemu-devel@nongnu.org; Fri, 22 Aug 2014 12:32:56 -0400 From: Max Reitz Date: Fri, 22 Aug 2014 18:31:38 +0200 Message-Id: <1408725104-17176-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1408725104-17176-1-git-send-email-mreitz@redhat.com> References: <1408725104-17176-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 04/10] qcow2: Reuse refcount table in calculate_refcounts() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz We will later call calculate_refcounts multiple times, so reuse the refcount table if possible. Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 2b728ef..babe6cb 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1584,10 +1584,12 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, QCowSnapshot *sn; int ret; - *refcount_table = g_try_new0(uint16_t, *nb_clusters); - if (*nb_clusters && *refcount_table == NULL) { - res->check_errors++; - return -ENOMEM; + if (!*refcount_table) { + *refcount_table = g_try_new0(uint16_t, *nb_clusters); + if (*nb_clusters && *refcount_table == NULL) { + res->check_errors++; + return -ENOMEM; + } } /* header */ @@ -1694,7 +1696,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, { BDRVQcowState *s = bs->opaque; int64_t size, highest_cluster, nb_clusters; - uint16_t *refcount_table; + uint16_t *refcount_table = NULL; int ret; size = bdrv_getlength(bs->file); -- 2.0.4