[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/23] qcow2: Decouple cluster allocation from clust
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 08/23] qcow2: Decouple cluster allocation from cluster reuse code |
Date: |
Thu, 28 Mar 2013 17:40:22 +0100 |
From: Kevin Wolf <address@hidden>
This moves some code that prepares the allocation of new clusters to
where the actual allocation happens. This is the minimum required to be
able to move it to a separate function in the next patch.
Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/qcow2-cluster.c | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 202adb4..9550927 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -946,10 +946,7 @@ again:
cluster_offset = be64_to_cpu(l2_table[l2_index]);
- /*
- * Check how many clusters are already allocated and don't need COW, and
how
- * many need a new allocation.
- */
+ /* Check how many clusters are already allocated and don't need COW */
if (qcow2_get_cluster_type(cluster_offset) == QCOW2_CLUSTER_NORMAL
&& (cluster_offset & QCOW_OFLAG_COPIED))
{
@@ -965,17 +962,6 @@ again:
cluster_offset = 0;
}
- if (nb_clusters > 0) {
- /* For the moment, overwrite compressed clusters one by one */
- uint64_t entry = be64_to_cpu(l2_table[l2_index + keep_clusters]);
- if (entry & QCOW_OFLAG_COMPRESSED) {
- nb_clusters = 1;
- } else {
- nb_clusters = count_cow_clusters(s, nb_clusters, l2_table,
- l2_index + keep_clusters);
- }
- }
-
cluster_offset &= L2E_OFFSET_MASK;
/*
@@ -996,6 +982,25 @@ again:
uint64_t alloc_cluster_offset;
uint64_t keep_bytes = keep_clusters * s->cluster_size;
+ ret = get_cluster_table(bs, offset, &l2_table, &l2_index);
+ if (ret < 0) {
+ return ret;
+ }
+
+ /* For the moment, overwrite compressed clusters one by one */
+ uint64_t entry = be64_to_cpu(l2_table[l2_index + keep_clusters]);
+ if (entry & QCOW_OFLAG_COMPRESSED) {
+ nb_clusters = 1;
+ } else {
+ nb_clusters = count_cow_clusters(s, nb_clusters, l2_table,
+ l2_index + keep_clusters);
+ }
+
+ ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
+ if (ret < 0) {
+ return ret;
+ }
+
/* Calculate start and size of allocation */
alloc_offset = offset + keep_bytes;
--
1.8.1.4
- [Qemu-devel] [PULL 00/23] Block patches, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 02/23] qemu-iotests: More concurrent allocation scenarios, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 01/23] vl.c: call bdrv_init_with_whitelist() before cmdline parsing, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 05/23] qcow2: Handle dependencies earlier, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 03/23] qcow2: Fix "total clusters" number in bdrv_check, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 04/23] qcow2: Remove bogus unlock of s->lock, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 06/23] qcow2: Improve check for overlapping allocations, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 08/23] qcow2: Decouple cluster allocation from cluster reuse code,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 07/23] qcow2: Change handle_dependency to byte granularity, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 09/23] qcow2: Factor out handle_alloc(), Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 11/23] qcow2: handle_alloc(): Get rid of keep_clusters parameter, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 10/23] qcow2: handle_alloc(): Get rid of nb_clusters parameter, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 12/23] qcow2: Finalise interface of handle_alloc(), Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 13/23] qcow2: Clean up handle_alloc(), Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 14/23] qcow2: Factor out handle_copied(), Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 15/23] qcow2: handle_copied(): Get rid of nb_clusters parameter, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 16/23] qcow2: handle_copied(): Get rid of keep_clusters parameter, Stefan Hajnoczi, 2013/03/28
- [Qemu-devel] [PATCH 18/23] qcow2: Prepare handle_alloc/copied() for byte granularity, Stefan Hajnoczi, 2013/03/28