[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 09/32] qcow2: Add subcluster-related fields to BDRVQcow2State
From: |
Alberto Garcia |
Subject: |
[PATCH v6 09/32] qcow2: Add subcluster-related fields to BDRVQcow2State |
Date: |
Sun, 24 May 2020 16:51:29 +0200 |
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 = subcluster_size
Images without subclusters are treated as if they had exactly one
subcluster per cluster (i.e. subcluster_size = cluster_size).
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2.h | 5 +++++
block/qcow2.c | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/block/qcow2.h b/block/qcow2.h
index f41bfd743f..4e9c732831 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)
+#define QCOW_EXTL2_SUBCLUSTERS_PER_CLUSTER 32
+
#define MIN_CLUSTER_BITS 9
#define MAX_CLUSTER_BITS 21
@@ -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 6562eb1590..916b6c3f92 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1433,6 +1433,11 @@ static int coroutine_fn qcow2_do_open(BlockDriverState
*bs, QDict *options,
}
}
+ s->subclusters_per_cluster =
+ has_subclusters(s) ? QCOW_EXTL2_SUBCLUSTERS_PER_CLUSTER : 1;
+ s->subcluster_size = s->cluster_size / s->subclusters_per_cluster;
+ s->subcluster_bits = 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 "
--
2.20.1
- [PATCH v6 03/32] qcow2: Add calculate_l2_meta(), (continued)
- [PATCH v6 03/32] qcow2: Add calculate_l2_meta(), Alberto Garcia, 2020/05/24
- [PATCH v6 29/32] qcow2: Add subcluster support to qcow2_measure(), Alberto Garcia, 2020/05/24
- [PATCH v6 14/32] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), Alberto Garcia, 2020/05/24
- [PATCH v6 10/32] qcow2: Add offset_to_sc_index(), Alberto Garcia, 2020/05/24
- [PATCH v6 05/32] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2020/05/24
- [PATCH v6 01/32] qcow2: Make Qcow2AioTask store the full host offset, Alberto Garcia, 2020/05/24
- [PATCH v6 06/32] qcow2: Add get_l2_entry() and set_l2_entry(), Alberto Garcia, 2020/05/24
- [PATCH v6 23/32] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2020/05/24
- [PATCH v6 12/32] qcow2: Add l2_entry_size(), Alberto Garcia, 2020/05/24
- [PATCH v6 16/32] qcow2: Add qcow2_cluster_is_allocated(), Alberto Garcia, 2020/05/24
- [PATCH v6 09/32] qcow2: Add subcluster-related fields to BDRVQcow2State,
Alberto Garcia <=
- [PATCH v6 02/32] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), Alberto Garcia, 2020/05/24
- [PATCH v6 22/32] qcow2: Add subcluster support to zero_in_l2_slice(), Alberto Garcia, 2020/05/24
- [PATCH v6 17/32] qcow2: Add cluster type parameter to qcow2_get_host_offset(), Alberto Garcia, 2020/05/24
- [PATCH v6 24/32] qcow2: Add subcluster support to check_refcounts_l2(), Alberto Garcia, 2020/05/24
- [PATCH v6 26/32] qcow2: Clear the L2 bitmap when allocating a compressed cluster, Alberto Garcia, 2020/05/24
- [PATCH v6 28/32] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes(), Alberto Garcia, 2020/05/24
- [PATCH v6 27/32] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2020/05/24
- [PATCH v6 19/32] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2020/05/24
- [PATCH v6 25/32] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/05/24
- [PATCH v6 11/32] qcow2: Add offset_into_subcluster() and size_to_subclusters(), Alberto Garcia, 2020/05/24