From nobody Sat Feb 7 08:13:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517842725595705.5947407110676; Mon, 5 Feb 2018 06:58:45 -0800 (PST) Received: from localhost ([::1]:51895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiiEG-00073M-Kt for importer@patchew.org; Mon, 05 Feb 2018 09:58:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eii5D-0007Zc-Pi for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eii5C-0000ck-Ue for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:23 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:49520) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eii5C-0000ax-L7; Mon, 05 Feb 2018 09:49:22 -0500 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1eihqj-0001rw-UV; Mon, 05 Feb 2018 15:34:26 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1eihqK-0008PR-45; Mon, 05 Feb 2018 16:34:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=gjUO8bXvPZ11ex3poiebeRj2wXzSNcdriYNqjgjTmpU=; b=M0Gj9d5UHxgQBTMh6OS8GeBDfn68MmP+KgpFA8SRuzXyLDQtgQEcluevkm+jW0VQ5PX9I0XfhaXi3srEFw10NSlCksYMNAVve7yJRvssKXEh9UwtE56kRzR/WSYPgwpK/OIeBZJqfVAjralRGkxcYvxAZSdZAmfHrr4AzaMRO7jOHTL0xP4txNrW/pA8bmeS5Nv0rIF6xtNpNMVGzDQwDjO9Rex6vDp4g1iTqeVUAhU9qtWsVTEhnybDbhcBfwJABGiFLIl08ZNEzv66GAAUB2MfZRNZLmOExsMZLn+xjoIlgiwA24uDAKOIrbGb+dh4BeLYI+ER9Usyy6MA/iWcIg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 16:33:34 +0200 Message-Id: <78bcc54bc632574dd0b900a77a00a1b6ffc359e6.1517840877.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH v4 34/39] qcow2: Rename l2_table in count_contiguous_clusters_unallocated() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Anton Nefedov , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , "Denis V . Lunev" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This function doesn't need any changes to support L2 slices, but since it's now dealing with slices intead of full tables, the l2_table variable is renamed for clarity. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- block/qcow2-cluster.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index f049e0e00e..11aa3628e4 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -407,10 +407,10 @@ static int count_contiguous_clusters(int nb_clusters,= int cluster_size, =20 /* * Checks how many consecutive unallocated clusters in a given L2 - * table have the same cluster type. + * slice have the same cluster type. */ static int count_contiguous_clusters_unallocated(int nb_clusters, - uint64_t *l2_table, + uint64_t *l2_slice, QCow2ClusterType wanted_t= ype) { int i; @@ -418,7 +418,7 @@ static int count_contiguous_clusters_unallocated(int nb= _clusters, assert(wanted_type =3D=3D QCOW2_CLUSTER_ZERO_PLAIN || wanted_type =3D=3D QCOW2_CLUSTER_UNALLOCATED); for (i =3D 0; i < nb_clusters; i++) { - uint64_t entry =3D be64_to_cpu(l2_table[i]); + uint64_t entry =3D be64_to_cpu(l2_slice[i]); QCow2ClusterType type =3D qcow2_get_cluster_type(entry); =20 if (type !=3D wanted_type) { --=20 2.11.0