From nobody Sat Feb 7 06:49:03 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 1517845638469420.3085056615647; Mon, 5 Feb 2018 07:47:18 -0800 (PST) Received: from localhost ([::1]:55301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiizF-0006n0-LX for importer@patchew.org; Mon, 05 Feb 2018 10:47:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eii5L-0007gr-P9 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eii5K-0000nh-U4 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:31 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:49534) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eii5K-0000mb-JO; Mon, 05 Feb 2018 09:49:30 -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 1eihqk-0001ry-0A; Mon, 05 Feb 2018 15:34:26 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1eihqK-0008PL-2C; 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=pwVkInREELKgIgEM9HQ+EArEVoxiFo7Avix0BMJQJdk=; b=a/xZIDPh9PAFaA+YGiA/Yy6dfBqKq2HM/dOVFZ79zjKX0ij/mciB3l+7jgX7G5sAXzZJFX/vMoIBcWPMCajRGhU+z4dorEgeHApTY/+gfNlkKIqYlqr+LmZjsAVK4Gm/NGKrHIPjGjfdg7FBdVTKiju6TOkfaRCiYX7RUbeBNGTC8paoTxY5hNkvkjrYnVWaCubVrN6DLZTtjvSxFXGii0+j1cCmX0TUYPi+NBlj2pS/Ir32PABeF+eB8avp2bDkjutzYf/YLQwnlraHbnfZEwl9cgHBruAKkFXMwjyvH4swVByxqSYQ59Ve42Aj+opLthbq8vP0kBLgU8kHhiph4Q==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 16:33:32 +0200 Message-Id: <0c5d4b9bf163aa3b49ec19cc512a50d83563f2ad.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 32/39] qcow2: Rename l2_table in qcow2_alloc_compressed_cluster_offset() 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 instead 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 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 072ce36328..54d435ca7d 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -748,26 +748,26 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockD= riverState *bs, { BDRVQcow2State *s =3D bs->opaque; int l2_index, ret; - uint64_t *l2_table; + uint64_t *l2_slice; int64_t cluster_offset; int nb_csectors; =20 - ret =3D get_cluster_table(bs, offset, &l2_table, &l2_index); + ret =3D get_cluster_table(bs, offset, &l2_slice, &l2_index); if (ret < 0) { return 0; } =20 /* Compression can't overwrite anything. Fail if the cluster was alrea= dy * allocated. */ - cluster_offset =3D be64_to_cpu(l2_table[l2_index]); + cluster_offset =3D be64_to_cpu(l2_slice[l2_index]); if (cluster_offset & L2E_OFFSET_MASK) { - qcow2_cache_put(s->l2_table_cache, (void **) &l2_table); + qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice); return 0; } =20 cluster_offset =3D qcow2_alloc_bytes(bs, compressed_size); if (cluster_offset < 0) { - qcow2_cache_put(s->l2_table_cache, (void **) &l2_table); + qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice); return 0; } =20 @@ -782,9 +782,9 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDri= verState *bs, /* compressed clusters never have the copied flag */ =20 BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE_COMPRESSED); - qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table); - l2_table[l2_index] =3D cpu_to_be64(cluster_offset); - qcow2_cache_put(s->l2_table_cache, (void **) &l2_table); + qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); + l2_slice[l2_index] =3D cpu_to_be64(cluster_offset); + qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice); =20 return cluster_offset; } --=20 2.11.0