[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/30] qcow2: Split cluster_needs_cow() out of count_cow_clust
From: |
Alberto Garcia |
Subject: |
[PATCH v4 04/30] qcow2: Split cluster_needs_cow() out of count_cow_clusters() |
Date: |
Tue, 17 Mar 2020 19:16:01 +0100 |
We are going to need it in other places.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2-cluster.c | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 802fc599a5..e251d00890 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1089,6 +1089,24 @@ static void calculate_l2_meta(BlockDriverState *bs,
QLIST_INSERT_HEAD(&s->cluster_allocs, *m, next_in_flight);
}
+/* Returns true if writing to a cluster requires COW */
+static bool cluster_needs_cow(BlockDriverState *bs, uint64_t l2_entry)
+{
+ switch (qcow2_get_cluster_type(bs, l2_entry)) {
+ case QCOW2_CLUSTER_NORMAL:
+ if (l2_entry & QCOW_OFLAG_COPIED) {
+ return false;
+ }
+ case QCOW2_CLUSTER_UNALLOCATED:
+ case QCOW2_CLUSTER_COMPRESSED:
+ case QCOW2_CLUSTER_ZERO_PLAIN:
+ case QCOW2_CLUSTER_ZERO_ALLOC:
+ return true;
+ default:
+ abort();
+ }
+}
+
/*
* Returns the number of contiguous clusters that can be used for an allocating
* write, but require COW to be performed (this includes yet unallocated space,
@@ -1101,25 +1119,11 @@ static int count_cow_clusters(BlockDriverState *bs, int
nb_clusters,
for (i = 0; i < nb_clusters; i++) {
uint64_t l2_entry = be64_to_cpu(l2_slice[l2_index + i]);
- QCow2ClusterType cluster_type = qcow2_get_cluster_type(bs, l2_entry);
-
- switch(cluster_type) {
- case QCOW2_CLUSTER_NORMAL:
- if (l2_entry & QCOW_OFLAG_COPIED) {
- goto out;
- }
+ if (!cluster_needs_cow(bs, l2_entry)) {
break;
- case QCOW2_CLUSTER_UNALLOCATED:
- case QCOW2_CLUSTER_COMPRESSED:
- case QCOW2_CLUSTER_ZERO_PLAIN:
- case QCOW2_CLUSTER_ZERO_ALLOC:
- break;
- default:
- abort();
}
}
-out:
assert(i <= nb_clusters);
return i;
}
--
2.20.1
- [PATCH v4 16/30] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, (continued)
- [PATCH v4 16/30] qcow2: Handle QCOW2_SUBCLUSTER_UNALLOCATED_ALLOC, Alberto Garcia, 2020/03/17
- [PATCH v4 29/30] qcow2: Add subcluster support to qcow2_measure(), Alberto Garcia, 2020/03/17
- [PATCH v4 18/30] qcow2: Add subcluster support to qcow2_get_host_offset(), Alberto Garcia, 2020/03/17
- [PATCH v4 06/30] qcow2: Add get_l2_entry() and set_l2_entry(), Alberto Garcia, 2020/03/17
- [PATCH v4 05/30] qcow2: Process QCOW2_CLUSTER_ZERO_ALLOC clusters in handle_copied(), Alberto Garcia, 2020/03/17
- [PATCH v4 11/30] qcow2: Add l2_entry_size(), Alberto Garcia, 2020/03/17
- [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 <=
- [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, 2020/03/17
- [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