From nobody Mon Feb 9 08:30:54 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 1507814299475350.69958548141346; Thu, 12 Oct 2017 06:18:19 -0700 (PDT) Received: from localhost ([::1]:45464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2dNG-0006fG-GG for importer@patchew.org; Thu, 12 Oct 2017 09:18:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2dGS-0001Gg-Ef for qemu-devel@nongnu.org; Thu, 12 Oct 2017 09:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2dGO-0001cC-FB for qemu-devel@nongnu.org; Thu, 12 Oct 2017 09:11:04 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:52452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e2dGO-0001YY-5c; Thu, 12 Oct 2017 09:11:00 -0400 Received: from a88-114-101-76.elisa-laajakaista.fi ([88.114.101.76] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1e2dGM-0006MO-RS; Thu, 12 Oct 2017 15:10:58 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1e2dCz-0003ab-9I; Thu, 12 Oct 2017 16:07:29 +0300 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=uFDeYvxX2OIPpz0ZHBdw24rUur+df7Ywo60hNeGBmyE=; b=GklAHMMXe/rLrMnD8ge/k1mbYCBfBbYLqoueUVRY650H7g9ueRgs0YJcypQxqq/ovafi6mMxmit+qR7wV0Z+1K+0Re//ptgGw994rCIcTqfTAcuNCbokE2PqDdL3NZx020sePcYONqMxVHq68/akFCug21fgO9SwyZyuTv8rmN+g/S95Opai/d0vYeZgJesicyDi0u9GS4pN3FdpLL7YnUmPNMcFDIpJ/2shR5iGEs4IYR36XA+lS5xFKeMHv2zReG4KQB8PdAcDw4gvQiIJLYRTxsuhQG+71TkfkAds+wfeBpFQ0J3WAvByASUcjbtgEeTM32S32GlFjudzVyi5pg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 12 Oct 2017 16:05:40 +0300 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 26/31] 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 , "Denis V . Lunev" , Alberto Garcia , qemu-block@nongnu.org, Max Reitz 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 --- block/qcow2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index e5458fcffd..63e88a1d6e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3252,8 +3252,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