From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKBEi-0005Ds-NU for qemu-devel@nongnu.org; Mon, 25 Mar 2013 13:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKBEf-00045D-Ds for qemu-devel@nongnu.org; Mon, 25 Mar 2013 13:31:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19306) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKBEf-000457-3N for qemu-devel@nongnu.org; Mon, 25 Mar 2013 13:31:05 -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 r2PHV4rf012767 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Mar 2013 13:31:04 -0400 From: Kevin Wolf Date: Mon, 25 Mar 2013 18:30:15 +0100 Message-Id: <1364232620-5293-15-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 14/19] qcow2: handle_copied(): Get rid of keep_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 Now *bytes is used to return the length of the area that can be written to without performing an allocation or COW. Signed-off-by: Kevin Wolf --- block/qcow2-cluster.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 4e084dd..c36b1e7 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -831,19 +831,17 @@ static int handle_dependencies(BlockDriverState *bs, uint64_t guest_offset, * * -errno: in error cases * - * 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) + uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m) { BDRVQcowState *s = bs->opaque; int l2_index; uint64_t cluster_offset; uint64_t *l2_table; unsigned int nb_clusters; + unsigned int keep_clusters; int ret, pret; trace_qcow2_handle_copied(qemu_coroutine_self(), guest_offset, *host_offset, @@ -873,17 +871,19 @@ static int handle_copied(BlockDriverState *bs, uint64_t guest_offset, && (cluster_offset & QCOW_OFLAG_COPIED)) { /* We keep all QCOW_OFLAG_COPIED clusters */ - *keep_clusters = + keep_clusters = count_contiguous_clusters(nb_clusters, s->cluster_size, &l2_table[l2_index], 0, QCOW_OFLAG_COPIED | QCOW_OFLAG_ZERO); - assert(*keep_clusters <= nb_clusters); + assert(keep_clusters <= nb_clusters); + + *bytes = MIN(*bytes, + keep_clusters * s->cluster_size + - offset_into_cluster(s, guest_offset)); ret = 1; } else { - *keep_clusters = 0; cluster_offset = 0; - ret = 0; } @@ -1167,16 +1167,19 @@ 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, - &keep_clusters); + ret = handle_copied(bs, offset, &cluster_offset, &cur_bytes, m); if (ret < 0) { return ret; } else if (ret) { + keep_clusters = + size_to_clusters(s, cur_bytes + offset_into_cluster(s, offset)); nb_clusters -= keep_clusters; if (!*host_offset) { *host_offset = cluster_offset; } + } else { + keep_clusters = 0; } /* If there is something left to allocate, do that now */ -- 1.8.1.4