From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhPDy-00064j-Sv for qemu-devel@nongnu.org; Thu, 23 Oct 2014 16:43:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhPDt-0002QQ-N1 for qemu-devel@nongnu.org; Thu, 23 Oct 2014 16:43:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhPDt-0002QC-Fk for qemu-devel@nongnu.org; Thu, 23 Oct 2014 16:43:05 -0400 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 s9NKh4ti015650 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 23 Oct 2014 16:43:05 -0400 From: Kevin Wolf Date: Thu, 23 Oct 2014 22:42:23 +0200 Message-Id: <1414096959-14682-17-git-send-email-kwolf@redhat.com> In-Reply-To: <1414096959-14682-1-git-send-email-kwolf@redhat.com> References: <1414096959-14682-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 16/32] 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: kwolf@redhat.com From: Max Reitz We will later call calculate_refcounts multiple times, so reuse the refcount table if possible. Signed-off-by: Max Reitz Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- 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 d653124..c92e1fc 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1661,10 +1661,12 @@ static int calculate_refcounts(BlockDriverState *= bs, BdrvCheckResult *res, QCowSnapshot *sn; int ret; =20 - *refcount_table =3D g_try_new0(uint16_t, *nb_clusters); - if (*nb_clusters && *refcount_table =3D=3D NULL) { - res->check_errors++; - return -ENOMEM; + if (!*refcount_table) { + *refcount_table =3D g_try_new0(uint16_t, *nb_clusters); + if (*nb_clusters && *refcount_table =3D=3D NULL) { + res->check_errors++; + return -ENOMEM; + } } =20 /* header */ @@ -1780,7 +1782,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, Bdr= vCheckResult *res, { BDRVQcowState *s =3D bs->opaque; int64_t size, highest_cluster, nb_clusters; - uint16_t *refcount_table; + uint16_t *refcount_table =3D NULL; int ret; =20 size =3D bdrv_getlength(bs->file); --=20 1.8.3.1