From nobody Mon Feb 9 09:17:04 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=1584469858; cv=none; d=zohomail.com; s=zohoarc; b=G2X5uJESy0HWswGiY80tnlDGQ5PgBNI+3m9HGEzfjuNQ6naXnaHGAgEb9heKn7at9KgucIa9fPEW+td+/u/lvHFynl6rGH6/BvsOTs+3nDSxvQvuVv/6AAdXCFAo6rKDnwhiZK9ejLX8SGwuoYONdsycLdTIRZ+jEx0TPnPDcx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584469858; 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=oWauXz47PpW+xVTM/4Ib2FZL1+ZMSwNIBOfuc4avzAI=; b=c6c0Ps92EjArnMFI8nytMUEK0slLHIxNJor7RB55mZH+im8snKQaO0NPXgc2/qNQh9QeM5Rx7XDyzdo0cccCwHeu5X9yzc0+9vm7S4FqlO5BjkZZVhQ5NnQenNNSSXpJjcJgp5BNyQ703rDEwU3as8wqA+AAFMC04bv2VtnAeeM= 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 1584469858996367.36392299015574; Tue, 17 Mar 2020 11:30:58 -0700 (PDT) Received: from localhost ([::1]:39302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGzR-00063P-Op for importer@patchew.org; Tue, 17 Mar 2020 14:30:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48682) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGmt-0003LK-GX for qemu-devel@nongnu.org; Tue, 17 Mar 2020 14:18:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGms-0008U4-En for qemu-devel@nongnu.org; Tue, 17 Mar 2020 14:17:59 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:57705) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGms-0005Ut-5D; Tue, 17 Mar 2020 14:17:58 -0400 Received: from [81.0.35.138] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jEGmD-00015c-0i; Tue, 17 Mar 2020 19:17:17 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jEGlw-0006Oj-OL; Tue, 17 Mar 2020 19:17:00 +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=oWauXz47PpW+xVTM/4Ib2FZL1+ZMSwNIBOfuc4avzAI=; b=WYjpzvM73Lgs5SQe1qRRYChrWddCJt7O19zP1KdeOkjdxCo2Za00xelT0D3jJPyEG+c8rULlL/Cmbk11q5nwkbKaYY/nH9uNrHH5XWgo3B23FQrGCfJ5jV9ZdFZzbUxi7AKmhKSY2b2lSJzdBHwLOUUXbf1GBkLHbZHrROSqoQr1QDGprXdzAVOohkHEVPpCGSFFafRbzpwDWv53pQRGkg5LS1zyXmzbPF3N/y7cM/sjGHcL2Dt5Q5EoOySWNBg8dL5vWoDj4nAcTHpBdrdnqd+IW4Z4iBipAt9p5M79J6wPSKxLymu9+/8tZzw27KkHoF0W3XIp4LsRABKA6LdV8w==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v4 21/30] qcow2: Add subcluster support to check_refcounts_l2() Date: Tue, 17 Mar 2020 19:16:18 +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 Reviewed-by: Vladimir Sementsov-Ogievskiy --- 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 3b89a97fd0..9337496c84 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1686,8 +1686,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