[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 15/23] qcow2: Add subcluster support to zero_in_l2_slice()
From: |
Alberto Garcia |
Subject: |
[RFC PATCH 15/23] qcow2: Add subcluster support to zero_in_l2_slice() |
Date: |
Tue, 15 Oct 2019 18:23:26 +0300 |
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>
---
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 71d4cc518a..c554b1a88c 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1849,7 +1849,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);
@@ -1866,12 +1866,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
- [RFC PATCH 23/23] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit, (continued)
- [RFC PATCH 23/23] qcow2: Add the 'extended_l2' option and the QCOW2_INCOMPAT_EXTL2 bit, Alberto Garcia, 2019/10/15
- [RFC PATCH 11/23] qcow2: Add qcow2_get_subcluster_type(), Alberto Garcia, 2019/10/15
- [RFC PATCH 08/23] qcow2: Add offset_to_sc_index(), Alberto Garcia, 2019/10/15
- [RFC PATCH 19/23] qcow2: Fix offset calculation in handle_dependencies(), Alberto Garcia, 2019/10/15
- [RFC PATCH 02/23] qcow2: Split cluster_needs_cow() out of count_cow_clusters(), Alberto Garcia, 2019/10/15
- [RFC PATCH 20/23] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2(), Alberto Garcia, 2019/10/15
- [RFC PATCH 18/23] qcow2: Add subcluster support to expand_zero_clusters_in_l1(), Alberto Garcia, 2019/10/15
- [RFC PATCH 21/23] qcow2: Add subcluster support to handle_alloc_space(), Alberto Garcia, 2019/10/15
- [RFC PATCH 22/23] qcow2: Restrict qcow2_co_pwrite_zeroes() to full clusters only, Alberto Garcia, 2019/10/15
- [RFC PATCH 15/23] qcow2: Add subcluster support to zero_in_l2_slice(),
Alberto Garcia <=
- [RFC PATCH 14/23] qcow2: Add subcluster support to qcow2_get_cluster_offset(), Alberto Garcia, 2019/10/15
- [RFC PATCH 17/23] qcow2: Add subcluster support to check_refcounts_l2(), Alberto Garcia, 2019/10/15
- [RFC PATCH 07/23] qcow2: Add subcluster-related fields to BDRVQcow2State, Alberto Garcia, 2019/10/15
- [RFC PATCH 13/23] qcow2: Add subcluster support to calculate_l2_meta(), Alberto Garcia, 2019/10/15
- Re: [RFC PATCH 00/23] Add subcluster allocation to qcow2, Eric Blake, 2019/10/15
- Re: [RFC PATCH 00/23] Add subcluster allocation to qcow2, Vladimir Sementsov-Ogievskiy, 2019/10/23