ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qcow2: handle_copied(): Get rid of nb_clusters parameter 

handle_copied() uses its bytes parameter now to determine how many
clusters it should try to find.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2013-03-26 17:50:06 +01:00 committed by Stefan Hajnoczi
parent 0af729ec00
commit acb0467f8d
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
block/qcow2-cluster.c
View File

@ -831,24 +831,35 @@ static int handle_dependencies(BlockDriverState *bs, uint64_t guest_offset,
* *
* -errno: in error cases * -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 bytes behave like described above
* TODO Make non-zero host_offset behave like describe above * TODO Make non-zero host_offset behave like describe above
*/ */
static int handle_copied(BlockDriverState *bs, uint64_t guest_offset, static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m, 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; BDRVQcowState *s = bs->opaque;
int l2_index; int l2_index;
uint64_t cluster_offset; uint64_t cluster_offset;
uint64_t *l2_table; uint64_t *l2_table;
unsigned int nb_clusters;
int ret, pret; int ret, pret;
trace_qcow2_handle_copied(qemu_coroutine_self(), guest_offset, *host_offset, trace_qcow2_handle_copied(qemu_coroutine_self(), guest_offset, *host_offset,
*bytes); *bytes);
assert(*host_offset == 0); 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 */ /* Find L2 entry for the first involved cluster */
ret = get_cluster_table(bs, guest_offset, &l2_table, &l2_index); ret = get_cluster_table(bs, guest_offset, &l2_table, &l2_index);
if (ret < 0) { if (ret < 0) {
@ -863,11 +874,10 @@ static int handle_copied(BlockDriverState *bs, uint64_t guest_offset,
{ {
/* We keep all QCOW_OFLAG_COPIED clusters */ /* We keep all QCOW_OFLAG_COPIED clusters */
*keep_clusters = *keep_clusters =
count_contiguous_clusters(*nb_clusters, s->cluster_size, count_contiguous_clusters(nb_clusters, s->cluster_size,
&l2_table[l2_index], 0, &l2_table[l2_index], 0,
QCOW_OFLAG_COPIED | QCOW_OFLAG_ZERO); QCOW_OFLAG_COPIED | QCOW_OFLAG_ZERO);
assert(*keep_clusters <= *nb_clusters); assert(*keep_clusters <= nb_clusters);
*nb_clusters -= *keep_clusters;
ret = 1; ret = 1;
} else { } else {
@ -1159,10 +1169,12 @@ again:
*/ */
uint64_t tmp_bytes = cur_bytes; uint64_t tmp_bytes = cur_bytes;
ret = handle_copied(bs, offset, &cluster_offset, &tmp_bytes, m, ret = handle_copied(bs, offset, &cluster_offset, &tmp_bytes, m,
&keep_clusters, &nb_clusters); &keep_clusters);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} else if (ret) { } else if (ret) {
nb_clusters -= keep_clusters;
if (!*host_offset) { if (!*host_offset) {
*host_offset = cluster_offset; *host_offset = cluster_offset;
} }