From nobody Mon Feb 9 01:07:08 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 1516981093951140.2034690548037; Fri, 26 Jan 2018 07:38:13 -0800 (PST) Received: from localhost ([::1]:33812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef64z-0004gD-4J for importer@patchew.org; Fri, 26 Jan 2018 10:38:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5q9-000142-20 for qemu-devel@nongnu.org; Fri, 26 Jan 2018 10:22:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef5q6-00035o-4g for qemu-devel@nongnu.org; Fri, 26 Jan 2018 10:22:53 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:54718) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ef5q5-00035O-T4; Fri, 26 Jan 2018 10:22:50 -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-0007gx-Pl; Fri, 26 Jan 2018 16:00:49 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1ef5UH-00087x-Tl; Fri, 26 Jan 2018 17:00:17 +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=stn8t0SMR9FZGYYxBzcYvFvmkQVwz6+Hw0AFsxlKybs=; b=Fjc7HXIEMrND7zF2nmveBHFcE4VDINA/1wwD1kf8xyV2i6PMvxy86tTaxOP1XopES/rRRlG0fmGrQyxEouKC3bGi++Djl5jGc1w9fmpi/8qxXJf8DUuLWtoW0heQlSESUf1I1PAfR5bPwQEPd5jK1Ep1NLFapVPmvERRDOgiRxnpvBke/PqrubQFsXZSe12mHGSKrHK6fMDIgy9JXTF/zz5jhnf84hUblIIv0cBO2KuTP+uRwlaURPrdhR09HdYL2AC9Wdyb6HSb1GOykfBFKJPmsTAb81sjwf1fgwUmXNapO/Umzn+nOitOFp1QnLBEIw9T4tv7lqnE3oAjuSq/PQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 26 Jan 2018 16:59:58 +0200 Message-Id: <896a464d5933927db49c968682de8c2b6e59635f.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 31/39] qcow2: Update qcow2_truncate() 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" The qcow2_truncate() code is mostly independent from whether we're using L2 slices or full L2 tables, but in full and falloc preallocation modes new L2 tables are allocated using qcow2_alloc_cluster_link_l2(). Therefore the code needs to be modified to ensure that all nb_clusters that are processed in each call can be allocated with just one L2 slice. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- block/qcow2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 78f067cae7..529becfa30 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3261,8 +3261,9 @@ static int qcow2_truncate(BlockDriverState *bs, int64= _t offset, guest_offset =3D old_length; while (nb_new_data_clusters) { int64_t guest_cluster =3D guest_offset >> s->cluster_bits; - int64_t nb_clusters =3D MIN(nb_new_data_clusters, - s->l2_size - guest_cluster % s->l2_s= ize); + int64_t nb_clusters =3D MIN( + nb_new_data_clusters, + s->l2_slice_size - guest_cluster % s->l2_slice_size); QCowL2Meta allocation =3D { .offset =3D guest_offset, .alloc_offset =3D host_offset, --=20 2.11.0