[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/19] qcow2: handle_copied(): Implement non-zero ho
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 15/19] qcow2: handle_copied(): Implement non-zero host_offset |
Date: |
Mon, 25 Mar 2013 18:30:16 +0100 |
Look only for clusters that start at a given physical offset.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-cluster.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index c36b1e7..3588773 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -830,8 +830,6 @@ static int handle_dependencies(BlockDriverState *bs,
uint64_t guest_offset,
* the length of the area that can be written to.
*
* -errno: in error cases
- *
- * TODO Make non-zero host_offset behave like describe above
*/
static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
@@ -846,7 +844,6 @@ static int handle_copied(BlockDriverState *bs, uint64_t
guest_offset,
trace_qcow2_handle_copied(qemu_coroutine_self(), guest_offset,
*host_offset,
*bytes);
- assert(*host_offset == 0);
/*
* Calculate the number of clusters to look for. We stop at L2 table
@@ -870,6 +867,16 @@ static int handle_copied(BlockDriverState *bs, uint64_t
guest_offset,
if (qcow2_get_cluster_type(cluster_offset) == QCOW2_CLUSTER_NORMAL
&& (cluster_offset & QCOW_OFLAG_COPIED))
{
+ /* If a specific host_offset is required, check it */
+ bool offset_matches =
+ (cluster_offset & L2E_OFFSET_MASK) == *host_offset;
+
+ if (*host_offset != 0 && !offset_matches) {
+ *bytes = 0;
+ ret = 0;
+ goto out;
+ }
+
/* We keep all QCOW_OFLAG_COPIED clusters */
keep_clusters =
count_contiguous_clusters(nb_clusters, s->cluster_size,
@@ -883,19 +890,22 @@ static int handle_copied(BlockDriverState *bs, uint64_t
guest_offset,
ret = 1;
} else {
- cluster_offset = 0;
ret = 0;
}
- cluster_offset &= L2E_OFFSET_MASK;
- *host_offset = cluster_offset;
-
/* Cleanup */
+out:
pret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
if (pret < 0) {
return pret;
}
+ /* Only return a host offset if we actually made progress. Otherwise we
+ * would make requirements for handle_alloc() that it can't fulfill */
+ if (ret) {
+ *host_offset = cluster_offset & L2E_OFFSET_MASK;
+ }
+
return ret;
}
@@ -1165,7 +1175,6 @@ again:
/*
* 2. Count contiguous COPIED clusters.
- * TODO: Consider cluster_offset if set in step 1c.
*/
ret = handle_copied(bs, offset, &cluster_offset, &cur_bytes, m);
if (ret < 0) {
@@ -1178,6 +1187,9 @@ again:
if (!*host_offset) {
*host_offset = cluster_offset;
}
+ } else if (cur_bytes == 0) {
+ keep_clusters = 0;
+ goto done;
} else {
keep_clusters = 0;
}
--
1.8.1.4
- Re: [Qemu-devel] [PATCH 01/19] qcow2: Fix "total clusters" number in bdrv_check, (continued)
- [Qemu-devel] [PATCH 06/19] qcow2: Decouple cluster allocation from cluster reuse code, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 05/19] qcow2: Change handle_dependency to byte granularity, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 09/19] qcow2: handle_alloc(): Get rid of keep_clusters parameter, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 08/19] qcow2: handle_alloc(): Get rid of nb_clusters parameter, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 07/19] qcow2: Factor out handle_alloc(), Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 11/19] qcow2: Clean up handle_alloc(), Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 10/19] qcow2: Finalise interface of handle_alloc(), Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 12/19] qcow2: Factor out handle_copied(), Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 14/19] qcow2: handle_copied(): Get rid of keep_clusters parameter, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 15/19] qcow2: handle_copied(): Implement non-zero host_offset,
Kevin Wolf <=
- [Qemu-devel] [PATCH 13/19] qcow2: handle_copied(): Get rid of nb_clusters parameter, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 16/19] qcow2: Use byte granularity in qcow2_alloc_cluster_offset(), Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 17/19] qcow2: Allow requests with multiple l2metas, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 18/19] qcow2: Move cluster gathering to a non-looping loop, Kevin Wolf, 2013/03/25
- [Qemu-devel] [PATCH 19/19] qcow2: Gather clusters in a looping loop, Kevin Wolf, 2013/03/25