From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKBEh-0005CZ-L9 for qemu-devel@nongnu.org; Mon, 25 Mar 2013 13:31:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKBEd-00044X-Pu for qemu-devel@nongnu.org; Mon, 25 Mar 2013 13:31:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKBEd-00044J-Fy for qemu-devel@nongnu.org; Mon, 25 Mar 2013 13:31:03 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2PHV2ph026761 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Mar 2013 13:31:03 -0400 From: Kevin Wolf Date: Mon, 25 Mar 2013 18:30:14 +0100 Message-Id: <1364232620-5293-14-git-send-email-kwolf@redhat.com> In-Reply-To: <1364232620-5293-1-git-send-email-kwolf@redhat.com> References: <1364232620-5293-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 13/19] qcow2: handle_copied(): Get rid of nb_clusters parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com handle_copied() uses its bytes parameter now to determine how many clusters it should try to find. Signed-off-by: Kevin Wolf --- 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 4be43c3..4e084dd 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 { @@ -1158,10 +1168,12 @@ again: * TODO: Consider cluster_offset if set in step 1c. */ ret = handle_copied(bs, offset, &cluster_offset, &cur_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