[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 19/30] qcow2: Add subcluster support to zero_in_l2_slice()
From: |
Alberto Garcia |
Subject: |
[PATCH v4 19/30] qcow2: Add subcluster support to zero_in_l2_slice() |
Date: |
Tue, 17 Mar 2020 19:16:16 +0100 |
Setting the QCOW_OFLAG_ZERO bit of the L2 entry is forbidden if an
image has subclusters. Instead, the individual 'all zeroes' bits must
be used.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2-cluster.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 6f2643ba53..746006a117 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1897,7 +1897,7 @@ static int zero_in_l2_slice(BlockDriverState *bs,
uint64_t offset,
assert(nb_clusters <= INT_MAX);
for (i = 0; i < nb_clusters; i++) {
- uint64_t old_offset;
+ uint64_t old_offset, l2_entry = 0;
QCow2ClusterType cluster_type;
old_offset = get_l2_entry(s, l2_slice, l2_index + i);
@@ -1914,12 +1914,18 @@ static int zero_in_l2_slice(BlockDriverState *bs,
uint64_t offset,
qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice);
if (cluster_type == QCOW2_CLUSTER_COMPRESSED || unmap) {
- set_l2_entry(s, l2_slice, l2_index + i, QCOW_OFLAG_ZERO);
qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST);
} else {
- uint64_t entry = get_l2_entry(s, l2_slice, l2_index + i);
- set_l2_entry(s, l2_slice, l2_index + i, entry | QCOW_OFLAG_ZERO);
+ l2_entry = get_l2_entry(s, l2_slice, l2_index + i);
}
+
+ if (has_subclusters(s)) {
+ set_l2_bitmap(s, l2_slice, l2_index + i,
QCOW_L2_BITMAP_ALL_ZEROES);
+ } else {
+ l2_entry |= QCOW_OFLAG_ZERO;
+ }
+
+ set_l2_entry(s, l2_slice, l2_index + i, l2_entry);
}
qcow2_cache_put(s->l2_table_cache, (void **) &l2_slice);
--
2.20.1
- [PATCH v4 02/30] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), (continued)
- [PATCH v4 02/30] qcow2: Convert qcow2_get_cluster_offset() into qcow2_get_host_offset(), Alberto Garcia, 2020/03/17
- [PATCH v4 15/30] qcow2: Replace QCOW2_CLUSTER_* with QCOW2_SUBCLUSTER_*, Alberto Garcia, 2020/03/17
- [PATCH v4 21/30] qcow2: Add subcluster support to check_refcounts_l2(), Alberto Garcia, 2020/03/17
- [PATCH v4 25/30] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2020/03/17
- [PATCH v4 04/30] qcow2: Split cluster_needs_cow() out of count_cow_clusters(), Alberto Garcia, 2020/03/17
- [PATCH v4 14/30] qcow2: Add cluster type parameter to qcow2_get_host_offset(), Alberto Garcia, 2020/03/17
- [PATCH v4 20/30] qcow2: Add subcluster support to discard_in_l2_slice(), Alberto Garcia, 2020/03/17
- [PATCH v4 08/30] qcow2: Add dummy has_subclusters() function, Alberto Garcia, 2020/03/17
- [PATCH v4 23/30] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2020/03/17
- [PATCH v4 24/30] qcow2: Clear the L2 bitmap when allocating a compressed cluster, Alberto Garcia, 2020/03/17
- [PATCH v4 19/30] qcow2: Add subcluster support to zero_in_l2_slice(),
Alberto Garcia <=
- [PATCH v4 26/30] qcow2: Restrict qcow2_co_pwrite_zeroes() to full clusters only, Alberto Garcia, 2020/03/17
- [PATCH v4 09/30] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2020/03/17
- [PATCH v4 27/30] qcow2: Assert that expand_zero_clusters_in_l1() does not support subclusters, Alberto Garcia, 2020/03/17
- [PATCH v4 13/30] qcow2: Add QCow2SubclusterType and qcow2_get_subcluster_type(), Alberto Garcia, 2020/03/17
- [PATCH v4 07/30] qcow2: Document the Extended L2 Entries feature, Alberto Garcia, 2020/03/17
- [PATCH v4 01/30] qcow2: Make Qcow2AioTask store the full host offset, Alberto Garcia, 2020/03/17
- [PATCH v4 03/30] qcow2: Add calculate_l2_meta(), Alberto Garcia, 2020/03/17
- [PATCH v4 17/30] qcow2: Add subcluster support to calculate_l2_meta(), Alberto Garcia, 2020/03/17
- [PATCH v4 30/30] iotests: Add tests for qcow2 images with extended L2 entries, Alberto Garcia, 2020/03/17