[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/18] qcow2: Refactor qcow2_free_any_clusters
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 07/18] qcow2: Refactor qcow2_free_any_clusters |
Date: |
Mon, 16 Apr 2012 17:02:05 +0200 |
Zero clusters will add another cluster type. Refactor the open-coded
cluster type detection into a switch of QCOW2_CLUSTER_* options so that
the detection is in a single place. This makes it easier to add new
cluster types.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-refcount.c | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 7c95fe3..2ec3aa7 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -673,31 +673,34 @@ void qcow2_free_clusters(BlockDriverState *bs,
}
/*
- * free_any_clusters
- *
- * free clusters according to its type: compressed or not
- *
+ * Free a cluster using its L2 entry (handles clusters of all types, e.g.
+ * normal cluster, compressed cluster, etc.)
*/
-
void qcow2_free_any_clusters(BlockDriverState *bs,
- uint64_t cluster_offset, int nb_clusters)
+ uint64_t l2_entry, int nb_clusters)
{
BDRVQcowState *s = bs->opaque;
- /* free the cluster */
-
- if (cluster_offset & QCOW_OFLAG_COMPRESSED) {
- int nb_csectors;
- nb_csectors = ((cluster_offset >> s->csize_shift) &
- s->csize_mask) + 1;
- qcow2_free_clusters(bs,
- (cluster_offset & s->cluster_offset_mask) & ~511,
- nb_csectors * 512);
- return;
+ switch (qcow2_get_cluster_type(l2_entry)) {
+ case QCOW2_CLUSTER_COMPRESSED:
+ {
+ int nb_csectors;
+ nb_csectors = ((l2_entry >> s->csize_shift) &
+ s->csize_mask) + 1;
+ qcow2_free_clusters(bs,
+ (l2_entry & s->cluster_offset_mask) & ~511,
+ nb_csectors * 512);
+ }
+ break;
+ case QCOW2_CLUSTER_NORMAL:
+ qcow2_free_clusters(bs, l2_entry & L2E_OFFSET_MASK,
+ nb_clusters << s->cluster_bits);
+ break;
+ case QCOW2_CLUSTER_UNALLOCATED:
+ break;
+ default:
+ abort();
}
-
- qcow2_free_clusters(bs, cluster_offset & L2E_OFFSET_MASK,
- nb_clusters << s->cluster_bits);
}
--
1.7.6.5
- [Qemu-devel] [PATCH v2 00/18] qcow2: Basic version 3 support, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 01/18] Specification for qcow2 version 3, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 02/18] qcow2: Save disk size in snapshot header, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 04/18] qcow2: Ignore reserved bits in count_contiguous_clusters(), Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 03/18] qcow2: Ignore reserved bits in get_cluster_offset, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 05/18] qcow2: Fail write_compressed when overwriting data, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 07/18] qcow2: Refactor qcow2_free_any_clusters,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 06/18] qcow2: Ignore reserved bits in L1/L2 entries, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 09/18] qcow2: Ignore reserved bits in refcount table entries, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 12/18] qcow2: Support reading zero clusters, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 08/18] qcow2: Simplify count_cow_clusters, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 10/18] qcow2: Ignore reserved bits in check_refcounts, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 13/18] qcow2: Support for feature table header extension, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 14/18] qemu-iotests: add a simple test for write_zeroes, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 15/18] qemu-iotests: Test backing file COW with zero clusters, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 17/18] qemu-iotests: Add -o and make v3 the default for qcow2, Kevin Wolf, 2012/04/16
- [Qemu-devel] [PATCH v2 18/18] qemu-iotests: Fix test 031 for qcow2 v3 support, Kevin Wolf, 2012/04/16