[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 09/34] qcow2: Add subcluster-related fields to BDRVQcow2State
From: |
Alberto Garcia |
Subject: |
[PATCH v8 09/34] qcow2: Add subcluster-related fields to BDRVQcow2State |
Date: |
Wed, 10 Jun 2020 17:02:47 +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 <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
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)
+#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 afb00ada42..5c175a314c 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 v8 07/34] qcow2: Document the Extended L2 Entries feature, (continued)
- [PATCH v8 07/34] qcow2: Document the Extended L2 Entries feature, Alberto Garcia, 2020/06/10
- [PATCH v8 02/34] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), Alberto Garcia, 2020/06/10
- [PATCH v8 16/34] qcow2: Add qcow2_cluster_is_allocated(), Alberto Garcia, 2020/06/10
- [PATCH v8 23/34] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2020/06/10
- [PATCH v8 14/34] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), Alberto Garcia, 2020/06/10
- [PATCH v8 25/34] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/06/10
- [PATCH v8 10/34] qcow2: Add offset_to_sc_index(), Alberto Garcia, 2020/06/10
- [PATCH v8 08/34] qcow2: Add dummy has_subclusters() function, Alberto Garcia, 2020/06/10
- [PATCH v8 05/34] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2020/06/10
- [PATCH v8 17/34] qcow2: Add cluster type parameter to qcow2_get_host_offset(), Alberto Garcia, 2020/06/10
- [PATCH v8 09/34] qcow2: Add subcluster-related fields to BDRVQcow2State,
Alberto Garcia <=
- [PATCH v8 21/34] qcow2: Add subcluster support to qcow2_get_host_offset(), Alberto Garcia, 2020/06/10
- [PATCH v8 24/34] qcow2: Add subcluster support to check_refcounts_l2(), Alberto Garcia, 2020/06/10
- [PATCH v8 18/34] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_*, Alberto Garcia, 2020/06/10
- [PATCH v8 28/34] qcow2: Add subcluster support to qcow2_co_pwrite_zeroes(), Alberto Garcia, 2020/06/10
- [PATCH v8 34/34] iotests: Add tests for qcow2 images with extended L2 entries, Alberto Garcia, 2020/06/10
- [PATCH v8 19/34] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2020/06/10
- [PATCH v8 26/34] qcow2: Clear the L2 bitmap when allocating a compressed cluster, Alberto Garcia, 2020/06/10
- [PATCH v8 31/34] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit, Alberto Garcia, 2020/06/10
- Re: [PATCH v8 00/34] Add subcluster allocation to qcow2, Eric Blake, 2020/06/10