From nobody Sat Feb 7 06:45: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 1517842954822415.5839962691887; Mon, 5 Feb 2018 07:02:34 -0800 (PST) Received: from localhost ([::1]:52132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiiHn-0001pd-5l for importer@patchew.org; Mon, 05 Feb 2018 10:02:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eii5K-0007ft-V4 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eii5J-0000mH-Kp for qemu-devel@nongnu.org; Mon, 05 Feb 2018 09:49:31 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:49531) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eii5J-0000l3-Aa; Mon, 05 Feb 2018 09:49:29 -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 1eihqj-0001s3-VM; Mon, 05 Feb 2018 15:34:26 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1eihqK-0008PI-0X; 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=8E/QETYmoAXHVTBbDF0IujHhWc9juHb04Dwp6IM5CFk=; b=mPNcT8Kv6FqjMczELCPDVShDr7FlNhrq9E02QQkU6SA1bf9oWyc9VEa1dwknThtAHpLu67hMF7wuFVHHG/ygAGceJYqDekZZbjgk5DOZzEDZSbhHyngPOU+y15HkskJJ5v/5nffiG/9hNWdwcJNAmZ/5CAnzpBfC6m/yFtmqDGlvyCNUzBYRMwLbBlX+PEeuEfeov5davuPRazBTBXjB0TbG8mFzqHV3wRY+ThnRNP5X9oHPj1nD4mSSB/8vaEDVpemZrSDABh6AImnaNoIqMz+D5veTgN5+WCI6LynGhZP9fbVzvhBwTOESqLvHr7khTxskYGfYxLNo0ES7oVJ3/A==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 16:33:31 +0200 Message-Id: <1fd7d272b5e7b66254a090b74cf2bed1cc334c0e.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 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 78f067cae7..28050a4b3e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3260,9 +3260,9 @@ static int qcow2_truncate(BlockDriverState *bs, int64= _t offset, host_offset =3D allocation_start; 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 - offset_to_l2_slice_index(s, guest_offse= t)); QCowL2Meta allocation =3D { .offset =3D guest_offset, .alloc_offset =3D host_offset, --=20 2.11.0