From nobody Mon Feb 9 05:37:09 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516984597259325.8869037151885; Fri, 26 Jan 2018 08:36:37 -0800 (PST) Received: from localhost ([::1]:37071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef6zO-00054h-5T for importer@patchew.org; Fri, 26 Jan 2018 11:36:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef6qv-0007Ba-Un for qemu-devel@nongnu.org; Fri, 26 Jan 2018 11:27:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef6qv-0004Jl-09 for qemu-devel@nongnu.org; Fri, 26 Jan 2018 11:27:45 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:38580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ef6qu-0004Gq-Jm; Fri, 26 Jan 2018 11:27:44 -0500 Received: from 88-114-101-230.elisa-laajakaista.fi ([88.114.101.230] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1ef5Un-0007gy-Mf; Fri, 26 Jan 2018 16:00:49 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1ef5UI-000883-0I; Fri, 26 Jan 2018 17:00:18 +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=u2sWAp4SSGnWGtzDjHAxzn0XlO7v3MAIq0vna7RvvnM=; b=UPSVLWyKlo5hSbxpS+QuPO3IOMntkwCJwslBD9kwPhx0fcZUtEeBo5dvdf5+QDlg7hqYWTFuC49QR88xwq1EWSaSg8cET5UxxrkVtpUJIBfrMvePIRoxF+sOQDrUx21NGJtrEq5hPCfRAI+6cXqRHNChhdt7n8hiBBMnuIjxx0GwHrRfC/ORyieHkzMOSMarI36FYO1LmrXje856V51yhsT2j0AWOK/ChhVjmvIKWTOuJVMUbnHff56j3Yw00fnBJlC1miSNW/zEq3uEcv9lZ6kb+EGT7TndDqG4r5jmg24b584Sn0MxinsAeArKM22x3mBYkNzbYo6CMhcQthOPtg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 26 Jan 2018 17:00:00 +0200 Message-Id: <8ad7c315825732f819cae7d1460e856a04d095a5.1516978645.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 v3 33/39] qcow2: Rename l2_table in count_contiguous_clusters() 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 2d46927dc5..60c38a71f1 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -371,19 +371,19 @@ fail: } =20 /* - * Checks how many clusters in a given L2 table are contiguous in the image + * Checks how many clusters in a given L2 slice are contiguous in the image * file. As soon as one of the flags in the bitmask stop_flags changes com= pared * to the first cluster, the search is stopped and the cluster is not coun= ted * as contiguous. (This allows it, for example, to stop at the first compr= essed * cluster which may require a different handling) */ static int count_contiguous_clusters(int nb_clusters, int cluster_size, - uint64_t *l2_table, uint64_t stop_flags) + uint64_t *l2_slice, uint64_t stop_flags) { int i; QCow2ClusterType first_cluster_type; uint64_t mask =3D stop_flags | L2E_OFFSET_MASK | QCOW_OFLAG_COMPRESSED; - uint64_t first_entry =3D be64_to_cpu(l2_table[0]); + uint64_t first_entry =3D be64_to_cpu(l2_slice[0]); uint64_t offset =3D first_entry & mask; =20 if (!offset) { @@ -396,7 +396,7 @@ static int count_contiguous_clusters(int nb_clusters, i= nt cluster_size, first_cluster_type =3D=3D QCOW2_CLUSTER_ZERO_ALLOC); =20 for (i =3D 0; i < nb_clusters; i++) { - uint64_t l2_entry =3D be64_to_cpu(l2_table[i]) & mask; + uint64_t l2_entry =3D be64_to_cpu(l2_slice[i]) & mask; if (offset + (uint64_t) i * cluster_size !=3D l2_entry) { break; } --=20 2.11.0