From patchwork Thu Mar 28 16:40:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 232133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D51772C00BE for ; Fri, 29 Mar 2013 04:08:28 +1100 (EST) Received: from localhost ([::1]:58146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULG4r-0006Aa-PZ for incoming@patchwork.ozlabs.org; Thu, 28 Mar 2013 12:53:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFtB-0005yR-EA for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULFt8-0002Fp-4q for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFt7-0002Fj-UD for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:18 -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 r2SGfHjF025122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Mar 2013 12:41:17 -0400 Received: from localhost (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2SGfGHb008810; Thu, 28 Mar 2013 12:41:16 -0400 From: Stefan Hajnoczi To: Date: Thu, 28 Mar 2013 17:40:29 +0100 Message-Id: <1364488837-15916-16-git-send-email-stefanha@redhat.com> In-Reply-To: <1364488837-15916-1-git-send-email-stefanha@redhat.com> References: <1364488837-15916-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 15/23] qcow2: handle_copied(): Get rid of nb_clusters parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Kevin Wolf handle_copied() uses its bytes parameter now to determine how many clusters it should try to find. Signed-off-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- 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; }