From nobody Mon Feb 9 02:55:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1577015570; cv=none; d=zohomail.com; s=zohoarc; b=f+FpZiaYnfocZTb8kifWM9S/AFyhBwHETt07mkPYSibvlId2BXyDejOFcCy8bbm0efZfeAx8VLbP1V4s8Gfrr8pdcuJmuj8lF0jozJmbA8XBOeipT1XO5rCp1WRPisruzhWgwSkd1HhFr4QO1RkomY9T5FQgSN6IN9bRhyBism0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577015570; 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=Vrl3GLQfcFIv5bcPqB/dgOQOJJKXmkDxlI4dGSew4sk=; b=gfYcU5IhjYAV3L6izseDkEMbQiAWfVgt75inzrs7a138SoOorLG0B+wUGXt/OKbu2wBRN0qtZVAr9RaJ7pSiR5v3cNknV85LF3fkfBlwO8atr4kCDOcmGKyZie7HBD4kMCfX5ABFSv8BJLsXlDSk/zj/goFKLHiPK9rcIbPOcZ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1577015570246700.4835473576562; Sun, 22 Dec 2019 03:52:50 -0800 (PST) Received: from localhost ([::1]:46880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iizmz-0001HC-2D for importer@patchew.org; Sun, 22 Dec 2019 06:52:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41504) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iizYp-0002nv-Dh for qemu-devel@nongnu.org; Sun, 22 Dec 2019 06:38:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iizYn-0005cC-Vr for qemu-devel@nongnu.org; Sun, 22 Dec 2019 06:38:11 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:34969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iizYn-0004Uw-Dg; Sun, 22 Dec 2019 06:38:09 -0500 Received: from [80.30.182.172] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iizYU-0005dK-Ub; Sun, 22 Dec 2019 12:37:52 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iizXu-0001W2-PP; Sun, 22 Dec 2019 12:37:14 +0100 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=Vrl3GLQfcFIv5bcPqB/dgOQOJJKXmkDxlI4dGSew4sk=; b=WFQdP98koBD8QUEBF/zd6IXqKqDA0kQe7zq29Mew7zyA7dKSDJrf9sKLU7hsBlBoV2cSjkGKKP5SkqvPkp73VshzcFXUg6hHUOwY0QzzCs9ti9Cx5JFc4pvmJULQwbZt59ai9qTIUFmfbUvNgkLlAgqPwNO2UpFLuIjssescEKzor4y8HHWTBZmucQkCkT5k075wZAt7+ZXkh3V3N4vZZD6gfgglDf62ISnb8c7HmUvGZpu3LXYa5FjrKgUXN+V7xHaF8mflg5Fe/q+aU40qt747IbCfnfuNJaG/1CYVzBXYynbn85yRIEskl6Z38szD1B6jj+/dfWmGyH5PJuB/eQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH v3 18/27] qcow2: Add subcluster support to check_refcounts_l2() Date: Sun, 22 Dec 2019 12:36:59 +0100 Message-Id: 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 Reviewed-by: Max Reitz --- 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 de85ed29a4..65f4fc27c3 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