From nobody Sun Feb 8 23:06:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1572128426; cv=none; d=zoho.com; s=zohoarc; b=lF51gCG55y8gj8WupLmZ5AgUnl56XtBS04o3qGJIQtulUE2QszKeaDuobtM8daAi48Ygo23Q3JBgTnl+HWar0sbjWHhZTXz9hBcdG0cTC5gTS94bjZGUbMfAGzhvqjheg/JJuulGE56HFrACVEwGBrr+4FEEWdnYun4YmyxH15w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572128426; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fDwvVM+XJotAqzLmOm7fdOCG+L3RWfPh9lZjBn8RghE=; b=eLXx373W+BcJAny12/UU1Q8I4fUY3/H1ySBP7dEKutqElL+AXHdwknBZM+GtGeVLkS7G6skEHbZrynABDc8MElMwY22YH5idVC2O9mTpPKwRZBOc3v7fzbXNONGKplVrTdmkr0tfuU9HdAMeC+Vh7SMVCiLVmI6AyLY6zXnmhRI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572128426635645.5468710783357; Sat, 26 Oct 2019 15:20:26 -0700 (PDT) Received: from localhost ([::1]:43084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOUQ4-0000Pl-Ii for importer@patchew.org; Sat, 26 Oct 2019 18:20:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60473) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOTa3-0000cw-Iq for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iOTZz-0005W4-Qz for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:37 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:42548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iOTZy-0005Hf-TD; Sat, 26 Oct 2019 17:26:35 -0400 Received: from 87-100-137-117.bb.dnainternet.fi ([87.100.137.117] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iOTZJ-000465-05; Sat, 26 Oct 2019 23:25:53 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iOTZ0-0001PZ-Q3; Sun, 27 Oct 2019 00:25:34 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=fDwvVM+XJotAqzLmOm7fdOCG+L3RWfPh9lZjBn8RghE=; b=lZhkplkoZlLxr3A1WCRmnAUIPlXQSkO4RwMOnwGjdOKx2NM0gsV2JEtZsQlPhx5zo2RiZ6DC60nvcLffqxKu2ex8dDoJ8E9OytcBQzh5dsNq3x75HHDPKFMvI8bX4zB15bSWh+jWpzKAnk/zYHwjq5UYnhdb+kjL+Z5MNstjzGbSif7JKh1ZngAloCXTeimRIH2EDZ2D8XU1qSo8aPE+3Kqr8ndGUFcFwrjYI4Do3s/fcD9vUTNlaxCdZ0Tmo+g2QzIlMVZNRduML630WWwVxGfWb5lpXIJR+DQcv8EmiiKCOBXg1qB98iW0IqRm18jN8KSx5KiPEctMriNBAnSzyQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 17/26] qcow2: Add subcluster support to check_refcounts_l2() Date: Sun, 27 Oct 2019 00:25:19 +0300 Message-Id: <08a812e1bc1a05c1c102029480bf7bc65ebf0beb.1572125022.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 178.60.130.6 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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 , Vladimir Sementsov-Ogievskiy , "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) Content-Type: text/plain; charset="utf-8" Setting the QCOW_OFLAG_ZERO bit of the L2 entry is forbidden if an image has subclusters. Instead, the individual 'all zeroes' bits must be used. Signed-off-by: Alberto Garcia --- block/qcow2-refcount.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 621318447d..bc73125f70 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1685,8 +1685,13 @@ static int check_refcounts_l2(BlockDriverState *bs, = BdrvCheckResult *res, int ign =3D active ? QCOW2_OL_ACTIVE_L2 : QCOW2_OL_INACTIVE_L2; =20 - l2_entry =3D QCOW_OFLAG_ZERO; - set_l2_entry(s, l2_table, i, l2_entry); + if (has_subclusters(s)) { + set_l2_entry(s, l2_table, i, 0); + set_l2_bitmap(s, l2_table, i, + QCOW_L2_BITMAP_ALL_ZEROES); + } else { + set_l2_entry(s, l2_table, i, QCOW_OFLAG_ZERO); + } ret =3D qcow2_pre_write_overlap_check(bs, ign, l2e_offset, l2_entry_size(s), false); if (ret < 0) { --=20 2.20.1