From nobody Mon Feb 9 00:46:20 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=1584469172; cv=none; d=zohomail.com; s=zohoarc; b=PgMiR78QxndYtxtPL50wynPlW2Ud9Njiu2A/xPNUmaqeRqfSdjHQwcka7ds5egpCYphTZTN1DJUm70Jg7JPQkcy0Hw7Xir0k1gjhB4qZHm4oSDWVoCnUgBBtiU76URLCu6tQZ9EQttsxVcTApqyGyGW/qdUCfmj3XiROhkr9kGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584469172; 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=LjK5j2bf8Ro+XMHhvP6jjCCoC2fozdNxPBv9pecMwAM=; b=IMKkO0avJrZ7AdD3tukDSCpZmaGuBAHDsrMmA0a/FMekw+cjFJA89Vj21ZD2NNYckkgxCjAPnJDb8qY9d0yErJzFEW1P/UWhiBTc+iOoxopIy7DGX+/KbaBxCzIJWinyuvMtBS85HSiYi4GVlMudwrbE7pS7SzLcel/pgHKgs+4= 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 1584469171615599.403040822519; Tue, 17 Mar 2020 11:19:31 -0700 (PDT) Received: from localhost ([::1]:38938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGoM-0004oV-6c for importer@patchew.org; Tue, 17 Mar 2020 14:19:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48361) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEGmc-0002p1-62 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 14:17:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEGmZ-0007Vr-3K for qemu-devel@nongnu.org; Tue, 17 Mar 2020 14:17:41 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:57765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEGmX-0005YS-Ao; Tue, 17 Mar 2020 14:17:38 -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-00014s-0S; Tue, 17 Mar 2020 19:17:17 +0100 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jEGlx-0006Oz-0s; Tue, 17 Mar 2020 19:17:01 +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=LjK5j2bf8Ro+XMHhvP6jjCCoC2fozdNxPBv9pecMwAM=; b=YgSsHHqFVMST/uUh3mSGJEGcDcNgip6AUrRRDri8/J9KR6ctkzwGGc2QK6hD/WvNkdxnpnq7BFsvEq6cf99ep6RDmVpe/ncX3VvZC+DAeSCBA3rkE+Jis74YhR95Yw7AgOw4eCFvUSA6VzmuaBzxRhjBrOs1+9rljEyMNl6Is9UpUSA6hrDOgEkvYQzkJsWstnVJLKFuXgvRzK1F6iDN5TEi+nj3UJVEeCJw3Jrt1AohcafFc4OE7Kg6ptT/+Jqo0+ThuQkkE/Q3/4DrsaITrkakqSobk79++4aTsMfAYv4fHeAhZutHOS3s+CcVx1wZUXSWvmzn05c1kc5gwxH5nw==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v4 29/30] qcow2: Add subcluster support to qcow2_measure() Date: Tue, 17 Mar 2020 19:16:26 +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" Extended L2 entries are bigger than normal L2 entries so this has an impact on the amount of metadata needed for a qcow2 file. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- block/qcow2.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 77b2713533..aefac85b23 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3154,28 +3154,31 @@ int64_t qcow2_refcount_metadata_size(int64_t cluste= rs, size_t cluster_size, * @total_size: virtual disk size in bytes * @cluster_size: cluster size in bytes * @refcount_order: refcount bits power-of-2 exponent + * @extended_l2: true if the image has extended L2 entries * * Returns: Total number of bytes required for the fully allocated image * (including metadata). */ static int64_t qcow2_calc_prealloc_size(int64_t total_size, size_t cluster_size, - int refcount_order) + int refcount_order, + bool extended_l2) { int64_t meta_size =3D 0; uint64_t nl1e, nl2e; int64_t aligned_total_size =3D ROUND_UP(total_size, cluster_size); + size_t l2e_size =3D extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL; =20 /* header: 1 cluster */ meta_size +=3D cluster_size; =20 /* total size of L2 tables */ nl2e =3D aligned_total_size / cluster_size; - nl2e =3D ROUND_UP(nl2e, cluster_size / sizeof(uint64_t)); - meta_size +=3D nl2e * sizeof(uint64_t); + nl2e =3D ROUND_UP(nl2e, cluster_size / l2e_size); + meta_size +=3D nl2e * l2e_size; =20 /* total size of L1 tables */ - nl1e =3D nl2e * sizeof(uint64_t) / cluster_size; + nl1e =3D nl2e * l2e_size / cluster_size; nl1e =3D ROUND_UP(nl1e, cluster_size / sizeof(uint64_t)); meta_size +=3D nl1e * sizeof(uint64_t); =20 @@ -4680,6 +4683,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, bool has_backing_file; bool has_luks; bool extended_l2; + size_t l2e_size; =20 /* Parse image creation options */ extended_l2 =3D qemu_opt_get_bool_del(opts, BLOCK_OPT_EXTL2, false); @@ -4748,8 +4752,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, virtual_size =3D ROUND_UP(virtual_size, cluster_size); =20 /* Check that virtual disk size is valid */ + l2e_size =3D extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL; l2_tables =3D DIV_ROUND_UP(virtual_size / cluster_size, - cluster_size / sizeof(uint64_t)); + cluster_size / l2e_size); if (l2_tables * sizeof(uint64_t) > QCOW_MAX_L1_SIZE) { error_setg(&local_err, "The image size is too large " "(try using a larger cluster size)"); @@ -4812,9 +4817,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts= , BlockDriverState *in_bs, } =20 info =3D g_new(BlockMeasureInfo, 1); - info->fully_allocated =3D + info->fully_allocated =3D luks_payload_size + qcow2_calc_prealloc_size(virtual_size, cluster_size, - ctz32(refcount_bits)) + luks_payload_size; + ctz32(refcount_bits), extended_l2); =20 /* Remove data clusters that are not required. This overestimates the * required size because metadata needed for the fully allocated file = is --=20 2.20.1