From nobody Sat Feb 7 08:13:35 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 1517844902705225.68381672914995; Mon, 5 Feb 2018 07:35:02 -0800 (PST) Received: from localhost ([::1]:53879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiinL-00041X-KL for importer@patchew.org; Mon, 05 Feb 2018 10:34:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eii5Z-0007xL-Bw for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eii5Y-000186-5J for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:45 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:49561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eii5X-00016P-Sl; Mon, 05 Feb 2018 09:49:44 -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 1eihqu-0001s3-Am; Mon, 05 Feb 2018 15:34:36 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1eihqJ-0008Oz-N0; Mon, 05 Feb 2018 16:33:59 +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=VZAlMQ0r/Tv3W5/eccnBbL3JXTlBrKq3zHOtnMedzyU=; b=FV94Ow/Sw4CqE5IF17I8Jk2J8XrOr3fdilfBNPOcmKxnsZTqq2YpcCcBGX4CZFk9I7PbPPlGaf8pLpls8AbiGIR65nRSIRhcrKoWGXmskF8o8kIMbSdpG6y6SOzauO6NkDYOR2kssN38YN42PPCzwZ8VUFzlch6vfFnRlISRF3fkb2hj+MnroxlIvre+n0d2CYtqdh4Ie82ej3NX/qieKPjMqD7Ge23yiaYst2QvfDe+OQnFwDTPgsMFrNEjVKwetb2KXrQS7CYDudtWggks7AiQOO0VkCruvrv80obPgb/Hl8qnFoY0GaUQ3q59lf6U3ghpY/eC6KipEEUWPM2eGg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 16:33:25 +0200 Message-Id: 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 25/39] qcow2: Update zero_single_l2() to support L2 slices 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" zero_single_l2() limits the number of clusters to be zeroed to the amount that fits inside an L2 table. Since we'll be loading L2 slices instead of full tables we need to update that limit. The function is renamed to zero_in_l2_slice() for clarity. Apart from that, this function doesn't need any additional changes, so this patch simply updates the variable name from l2_table to l2_slice. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake --- block/qcow2-cluster.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 95419eff38..068d1ee0a0 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1753,33 +1753,33 @@ fail: =20 /* * This zeroes as many clusters of nb_clusters as possible at once (i.e. - * all clusters in the same L2 table) and returns the number of zeroed + * all clusters in the same L2 slice) and returns the number of zeroed * clusters. */ -static int zero_single_l2(BlockDriverState *bs, uint64_t offset, - uint64_t nb_clusters, int flags) +static int zero_in_l2_slice(BlockDriverState *bs, uint64_t offset, + uint64_t nb_clusters, int flags) { BDRVQcow2State *s =3D bs->opaque; - uint64_t *l2_table; + uint64_t *l2_slice; int l2_index; int ret; int i; bool unmap =3D !!(flags & BDRV_REQ_MAY_UNMAP); =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 ret; } =20 - /* Limit nb_clusters to one L2 table */ - nb_clusters =3D MIN(nb_clusters, s->l2_size - l2_index); + /* Limit nb_clusters to one L2 slice */ + nb_clusters =3D MIN(nb_clusters, s->l2_slice_size - l2_index); assert(nb_clusters <=3D INT_MAX); =20 for (i =3D 0; i < nb_clusters; i++) { uint64_t old_offset; QCow2ClusterType cluster_type; =20 - old_offset =3D be64_to_cpu(l2_table[l2_index + i]); + old_offset =3D be64_to_cpu(l2_slice[l2_index + i]); =20 /* * Minimize L2 changes if the cluster already reads back as @@ -1791,16 +1791,16 @@ static int zero_single_l2(BlockDriverState *bs, uin= t64_t offset, continue; } =20 - qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table); + qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); if (cluster_type =3D=3D QCOW2_CLUSTER_COMPRESSED || unmap) { - l2_table[l2_index + i] =3D cpu_to_be64(QCOW_OFLAG_ZERO); + l2_slice[l2_index + i] =3D cpu_to_be64(QCOW_OFLAG_ZERO); qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUE= ST); } else { - l2_table[l2_index + i] |=3D cpu_to_be64(QCOW_OFLAG_ZERO); + l2_slice[l2_index + i] |=3D cpu_to_be64(QCOW_OFLAG_ZERO); } } =20 - qcow2_cache_put(s->l2_table_cache, (void **) &l2_table); + qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice); =20 return nb_clusters; } @@ -1824,13 +1824,13 @@ int qcow2_cluster_zeroize(BlockDriverState *bs, uin= t64_t offset, return -ENOTSUP; } =20 - /* Each L2 table is handled by its own loop iteration */ + /* Each L2 slice is handled by its own loop iteration */ nb_clusters =3D size_to_clusters(s, bytes); =20 s->cache_discards =3D true; =20 while (nb_clusters > 0) { - cleared =3D zero_single_l2(bs, offset, nb_clusters, flags); + cleared =3D zero_in_l2_slice(bs, offset, nb_clusters, flags); if (cleared < 0) { ret =3D cleared; goto fail; --=20 2.11.0