From nobody Mon Feb 9 11:07:56 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1593343185; cv=none; d=zohomail.com; s=zohoarc; b=INASnhB4rc8cohHAYDbSKIFFru1kERIcqDvbz4GP6PJi1hAzUpyT4f+QPpbNyaqer7/sO8TDNLjbfh4ceL2kK4qJbpCsYlAC4k/ueirz/tM3e9ZFBuKgtLQLZHJQalo0akuEIHDjcaekgYkBoxsBYUpA73Yw972QO65D9U+L8+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593343185; 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=zbMhjtGKVeY7EryanAE+iwZTdNLcuFqDn9UZxBryOf4=; b=Au2oVvglpWlCPNjtnjsKjhNQHklM+AUdkIYkjeY+48VncOzejrr9CfHgJOo+qmuT3Sbai86FAMnTGq+UQqPzesb4ZrLmxYx/+4nzZ9Yi87KvWDplAFxN0gH/D/pMyg2L194sSXuqNepIbTmZOPJ7Qi1mfosligEeJrVC8HDoxc8= 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 1593343185489257.1875674601598; Sun, 28 Jun 2020 04:19:45 -0700 (PDT) Received: from localhost ([::1]:42478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpVLc-0006Ze-8M for importer@patchew.org; Sun, 28 Jun 2020 07:19:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpV6P-0007Q0-Jx; Sun, 28 Jun 2020 07:04:01 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:42277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jpV6J-0000Wj-Js; Sun, 28 Jun 2020 07:04:01 -0400 Received: from 26.red-79-158-236.dynamicip.rima-tde.net ([79.158.236.26] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jpV5X-0002gV-K2; Sun, 28 Jun 2020 13:03:08 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jpV5H-00038P-Nn; Sun, 28 Jun 2020 13:02:51 +0200 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=zbMhjtGKVeY7EryanAE+iwZTdNLcuFqDn9UZxBryOf4=; b=RgagloH8tWgR7JNRrsXVZzN44kMze4oM6PSt/mJnNK9uu4XatQRVRXejFOtooSWdo8+hr7h8ss8j4zLOkutwTdX7fNkaviVS5/CXXarf6hRpObJq6dEPsGY+a1F0jV1VOR61DKnCJ7XI50yG3vm/RL68b5u0PCddp+QrsVZYRHnO88sOw/SymaFoQk/Go1ViQlFVYDHFplk8KRwQf86LG3yP8U1RTdHv8Pm2QRASNrwiyz/8o3lk7DiKT9q1W9bbOEOBOmUJkGxA0LJr6QxTjIkN2sOxGjFjaOP4Naqq7EspD15ZjfEnl8Cj9+i51U9Oh+RMLx9l+j19W5Qc37In3Q==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v9 09/34] qcow2: Add subcluster-related fields to BDRVQcow2State Date: Sun, 28 Jun 2020 13:02:18 +0200 Message-Id: <81ab1f501461c3870e4b6358fa966472760cd5b3.1593342067.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 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=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/28 07:03:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Derek Su , 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" This patch adds the following new fields to BDRVQcow2State: - subclusters_per_cluster: Number of subclusters in a cluster - subcluster_size: The size of each subcluster, in bytes - subcluster_bits: No. of bits so 1 << subcluster_bits =3D subcluster_size Images without subclusters are treated as if they had exactly one subcluster per cluster (i.e. subcluster_size =3D cluster_size). Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.h | 5 +++++ block/qcow2.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/block/qcow2.h b/block/qcow2.h index 2064dd3d85..eee4c8de9c 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -78,6 +78,8 @@ /* The cluster reads as all zeros */ #define QCOW_OFLAG_ZERO (1ULL << 0) =20 +#define QCOW_EXTL2_SUBCLUSTERS_PER_CLUSTER 32 + #define MIN_CLUSTER_BITS 9 #define MAX_CLUSTER_BITS 21 =20 @@ -295,6 +297,9 @@ typedef struct BDRVQcow2State { int cluster_bits; int cluster_size; int l2_slice_size; + int subcluster_bits; + int subcluster_size; + int subclusters_per_cluster; int l2_bits; int l2_size; int l1_size; diff --git a/block/qcow2.c b/block/qcow2.c index afb00ada42..5c175a314c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1433,6 +1433,11 @@ static int coroutine_fn qcow2_do_open(BlockDriverSta= te *bs, QDict *options, } } =20 + s->subclusters_per_cluster =3D + has_subclusters(s) ? QCOW_EXTL2_SUBCLUSTERS_PER_CLUSTER : 1; + s->subcluster_size =3D s->cluster_size / s->subclusters_per_cluster; + s->subcluster_bits =3D ctz32(s->subcluster_size); + /* Check support for various header values */ if (header.refcount_order > 6) { error_setg(errp, "Reference count entry width too large; may not " --=20 2.20.1