[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 30/31] qcow2: Add subcluster support to qcow2_measure()
From: |
Alberto Garcia |
Subject: |
[PATCH v5 30/31] qcow2: Add subcluster support to qcow2_measure() |
Date: |
Tue, 5 May 2020 19:38:30 +0200 |
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 <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 18c8e3f52a..31d72f1297 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3173,28 +3173,31 @@ int64_t qcow2_refcount_metadata_size(int64_t clusters,
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 = 0;
uint64_t nl1e, nl2e;
int64_t aligned_total_size = ROUND_UP(total_size, cluster_size);
+ size_t l2e_size = extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL;
/* header: 1 cluster */
meta_size += cluster_size;
/* total size of L2 tables */
nl2e = aligned_total_size / cluster_size;
- nl2e = ROUND_UP(nl2e, cluster_size / sizeof(uint64_t));
- meta_size += nl2e * sizeof(uint64_t);
+ nl2e = ROUND_UP(nl2e, cluster_size / l2e_size);
+ meta_size += nl2e * l2e_size;
/* total size of L1 tables */
- nl1e = nl2e * sizeof(uint64_t) / cluster_size;
+ nl1e = nl2e * l2e_size / cluster_size;
nl1e = ROUND_UP(nl1e, cluster_size / sizeof(uint64_t));
meta_size += nl1e * sizeof(uint64_t);
@@ -4765,6 +4768,7 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts,
BlockDriverState *in_bs,
bool has_backing_file;
bool has_luks;
bool extended_l2;
+ size_t l2e_size;
/* Parse image creation options */
extended_l2 = qemu_opt_get_bool_del(opts, BLOCK_OPT_EXTL2, false);
@@ -4833,8 +4837,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts,
BlockDriverState *in_bs,
virtual_size = ROUND_UP(virtual_size, cluster_size);
/* Check that virtual disk size is valid */
+ l2e_size = extended_l2 ? L2E_SIZE_EXTENDED : L2E_SIZE_NORMAL;
l2_tables = 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)");
@@ -4897,9 +4902,9 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts,
BlockDriverState *in_bs,
}
info = g_new(BlockMeasureInfo, 1);
- info->fully_allocated =
+ info->fully_allocated = luks_payload_size +
qcow2_calc_prealloc_size(virtual_size, cluster_size,
- ctz32(refcount_bits)) + luks_payload_size;
+ ctz32(refcount_bits), extended_l2);
/* Remove data clusters that are not required. This overestimates the
* required size because metadata needed for the fully allocated file is
--
2.20.1
- [PATCH v5 22/31] qcow2: Add subcluster support to discard_in_l2_slice(), (continued)
- [PATCH v5 22/31] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2020/05/05
- [PATCH v5 18/31] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2020/05/05
- [PATCH v5 01/31] qcow2: Make Qcow2AioTask store the full host offset, Alberto Garcia, 2020/05/05
- [PATCH v5 02/31] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), Alberto Garcia, 2020/05/05
- [PATCH v5 09/31] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2020/05/05
- [PATCH v5 12/31] qcow2: Add l2_entry_size(), Alberto Garcia, 2020/05/05
- [PATCH v5 24/31] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/05/05
- [PATCH v5 06/31] qcow2: Add get_l2_entry() and set_l2_entry(), Alberto Garcia, 2020/05/05
- [PATCH v5 21/31] qcow2: Add subcluster support to zero_in_l2_slice(), Alberto Garcia, 2020/05/05
- [PATCH v5 27/31] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes(), Alberto Garcia, 2020/05/05
- [PATCH v5 30/31] qcow2: Add subcluster support to qcow2_measure(),
Alberto Garcia <=
- [PATCH v5 29/31] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters, Alberto Garcia, 2020/05/05
- [PATCH v5 19/31] qcow2: Add subcluster support to calculate_l2_meta(), Alberto Garcia, 2020/05/05