[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/21] qcow2: handle_copied(): Get rid of nb_clus
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 14/21] qcow2: handle_copied(): Get rid of nb_clusters parameter |
Date: |
Tue, 26 Mar 2013 17:50:06 +0100 |
handle_copied() uses its bytes parameter now to determine how many
clusters it should try to find.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-cluster.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 9036bd8..d640328 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -831,24 +831,35 @@ static int handle_dependencies(BlockDriverState *bs,
uint64_t guest_offset,
*
* -errno: in error cases
*
- * TODO Get rid of keep_clusters, nb_clusters parameters
+ * TODO Get rid of keep_clusters parameter
* TODO Make bytes behave like described above
* 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,
- unsigned int *keep_clusters, unsigned int *nb_clusters)
+ unsigned int *keep_clusters)
{
BDRVQcowState *s = bs->opaque;
int l2_index;
uint64_t cluster_offset;
uint64_t *l2_table;
+ unsigned int nb_clusters;
int ret, pret;
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
+ * boundaries to keep things simple.
+ */
+ nb_clusters =
+ size_to_clusters(s, offset_into_cluster(s, guest_offset) + *bytes);
+
+ l2_index = offset_to_l2_index(s, guest_offset);
+ nb_clusters = MIN(nb_clusters, s->l2_size - l2_index);
+
/* Find L2 entry for the first involved cluster */
ret = get_cluster_table(bs, guest_offset, &l2_table, &l2_index);
if (ret < 0) {
@@ -863,11 +874,10 @@ static int handle_copied(BlockDriverState *bs, uint64_t
guest_offset,
{
/* We keep all QCOW_OFLAG_COPIED clusters */
*keep_clusters =
- count_contiguous_clusters(*nb_clusters, s->cluster_size,
+ count_contiguous_clusters(nb_clusters, s->cluster_size,
&l2_table[l2_index], 0,
QCOW_OFLAG_COPIED | QCOW_OFLAG_ZERO);
- assert(*keep_clusters <= *nb_clusters);
- *nb_clusters -= *keep_clusters;
+ assert(*keep_clusters <= nb_clusters);
ret = 1;
} else {
@@ -1159,10 +1169,12 @@ again:
*/
uint64_t tmp_bytes = cur_bytes;
ret = handle_copied(bs, offset, &cluster_offset, &tmp_bytes, m,
- &keep_clusters, &nb_clusters);
+ &keep_clusters);
if (ret < 0) {
return ret;
} else if (ret) {
+ nb_clusters -= keep_clusters;
+
if (!*host_offset) {
*host_offset = cluster_offset;
}
--
1.8.1.4
- [Qemu-devel] [PATCH v2 03/21] qcow2: Remove bogus unlock of s->lock, (continued)
- [Qemu-devel] [PATCH v2 03/21] qcow2: Remove bogus unlock of s->lock, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 06/21] qcow2: Change handle_dependency to byte granularity, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 08/21] qcow2: Factor out handle_alloc(), Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 07/21] qcow2: Decouple cluster allocation from cluster reuse code, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 05/21] qcow2: Improve check for overlapping allocations, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 09/21] qcow2: handle_alloc(): Get rid of nb_clusters parameter, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 10/21] qcow2: handle_alloc(): Get rid of keep_clusters parameter, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 12/21] qcow2: Clean up handle_alloc(), Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 15/21] qcow2: handle_copied(): Get rid of keep_clusters parameter, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 13/21] qcow2: Factor out handle_copied(), Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 14/21] qcow2: handle_copied(): Get rid of nb_clusters parameter,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 16/21] qcow2: handle_copied(): Implement non-zero host_offset, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 17/21] qcow2: Prepare handle_alloc/copied() for byte granularity, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 11/21] qcow2: Finalise interface of handle_alloc(), Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 18/21] qcow2: Use byte granularity in qcow2_alloc_cluster_offset(), Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 19/21] qcow2: Allow requests with multiple l2metas, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 21/21] qcow2: Gather clusters in a looping loop, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 20/21] qcow2: Move cluster gathering to a non-looping loop, Kevin Wolf, 2013/03/26
- Re: [Qemu-devel] [PATCH v2 00/21] qcow2: Rework cluster allocation even more, Stefan Hajnoczi, 2013/03/27