From nobody Tue Apr 8 23:36:20 2025 Delivered-To: importer@patchew.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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598345680; cv=none; d=zohomail.com; s=zohoarc; b=L7dVaiDn6IgM9NNNeQbXLR2r5LJgYcdwXaY+GX79jes+JBxKLkB4xCrKa5816/S1M6sytdYgIVjY+kXinLwktVw+SUm+4X+YbK/skQ6tMT61UyyvyQMhJt2H31Czf6vb7QlQJNE2yDfq6H+o7QEh0i9nTgCfthUqOXHYEIvz+JI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598345680; h=Content-Type: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=tWC0NAI9SqR335CvHWu7s3/mE4HBxzGKlhRP9R4+kuk=; b=RcuFJnrNfaavJXsQnULCpiX8jYUWc/nquyDGzpISWD/RaFTdnzaO+u+OPCahFZBY/ako5CMPUIDkB+2gPJzgc4grsXXzwYkUMHQuuZUUlf3ktBmwwuXUDagzT2AuJ0A69EccMvt9Pmdj9viBxcScr5hLlz2m8BolmjOrhyetjsk= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598345680448329.8936890249621; Tue, 25 Aug 2020 01:54:40 -0700 (PDT) Received: from localhost ([::1]:42264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAUj1-0007oN-01 for importer@patchew.org; Tue, 25 Aug 2020 04:54:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAUPp-0005v3-Gm for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:34:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAUPn-0000mm-EQ for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:34:49 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-40-Ldd0WGCFO8G5_ySSPdyJ-w-1; Tue, 25 Aug 2020 04:34:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F4875204; Tue, 25 Aug 2020 08:34:13 +0000 (UTC) Received: from localhost (ovpn-113-72.ams2.redhat.com [10.36.113.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0CE0060C15; Tue, 25 Aug 2020 08:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598344486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tWC0NAI9SqR335CvHWu7s3/mE4HBxzGKlhRP9R4+kuk=; b=dhAWrBoUhc3XkVyhqwVfbbR53Q3ViOMRzuHUQ1lSgY6Og+Gk8cuplvvXE5vl71b5ZSC5lG IbJiTMgyp448+Q8lLEySn1dxY2bUheZMu/8CwVj+JBy8IIiPx17cdyE1hTZV5xaI2bAXjA nxH6rJ8ZMcFtuMdTR+qCUBD1KNDX4JU= X-MC-Unique: Ldd0WGCFO8G5_ySSPdyJ-w-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 26/34] qcow2: Clear the L2 bitmap when allocating a compressed cluster Date: Tue, 25 Aug 2020 10:33:03 +0200 Message-Id: <20200825083311.1098442-27-mreitz@redhat.com> In-Reply-To: <20200825083311.1098442-1-mreitz@redhat.com> References: <20200825083311.1098442-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.956, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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 , Peter Maydell , qemu-devel@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) Content-Type: text/plain; charset="utf-8" From: Alberto Garcia Compressed clusters always have the bitmap part of the extended L2 entry set to 0. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Message-Id: <04455b3de5dfeb9d1cfe1fc7b02d7060a6e09710.1594396418.git.berto@= igalia.com> Signed-off-by: Max Reitz --- block/qcow2-cluster.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 816ddc7639..1e84bd8e2e 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -862,6 +862,9 @@ int qcow2_alloc_compressed_cluster_offset(BlockDriverSt= ate *bs, BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE_COMPRESSED); qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); set_l2_entry(s, l2_slice, l2_index, cluster_offset); + if (has_subclusters(s)) { + set_l2_bitmap(s, l2_slice, l2_index, 0); + } qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice); =20 *host_offset =3D cluster_offset & s->cluster_offset_mask; --=20 2.26.2