From patchwork Thu Mar 28 16:40:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 232116 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 AA8152C009C for ; Fri, 29 Mar 2013 03:49:10 +1100 (EST) Received: from localhost ([::1]:39744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFxe-0003a8-6g for incoming@patchwork.ozlabs.org; Thu, 28 Mar 2013 12:45:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFsx-0005UT-0i for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULFsu-0002CZ-Bx for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFsu-0002CR-3F for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:04 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2SGf3Tt025050 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Mar 2013 12:41:03 -0400 Received: from localhost (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2SGf2DK022465; Thu, 28 Mar 2013 12:41:02 -0400 From: Stefan Hajnoczi To: Date: Thu, 28 Mar 2013 17:40:22 +0100 Message-Id: <1364488837-15916-9-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.68 on 10.5.11.23 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 08/23] qcow2: Decouple cluster allocation from cluster reuse code 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 This moves some code that prepares the allocation of new clusters to where the actual allocation happens. This is the minimum required to be able to move it to a separate function in the next patch. Signed-off-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- block/qcow2-cluster.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 202adb4..9550927 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -946,10 +946,7 @@ again: cluster_offset = be64_to_cpu(l2_table[l2_index]); - /* - * Check how many clusters are already allocated and don't need COW, and how - * many need a new allocation. - */ + /* Check how many clusters are already allocated and don't need COW */ if (qcow2_get_cluster_type(cluster_offset) == QCOW2_CLUSTER_NORMAL && (cluster_offset & QCOW_OFLAG_COPIED)) { @@ -965,17 +962,6 @@ again: cluster_offset = 0; } - if (nb_clusters > 0) { - /* For the moment, overwrite compressed clusters one by one */ - uint64_t entry = be64_to_cpu(l2_table[l2_index + keep_clusters]); - if (entry & QCOW_OFLAG_COMPRESSED) { - nb_clusters = 1; - } else { - nb_clusters = count_cow_clusters(s, nb_clusters, l2_table, - l2_index + keep_clusters); - } - } - cluster_offset &= L2E_OFFSET_MASK; /* @@ -996,6 +982,25 @@ again: uint64_t alloc_cluster_offset; uint64_t keep_bytes = keep_clusters * s->cluster_size; + ret = get_cluster_table(bs, offset, &l2_table, &l2_index); + if (ret < 0) { + return ret; + } + + /* For the moment, overwrite compressed clusters one by one */ + uint64_t entry = be64_to_cpu(l2_table[l2_index + keep_clusters]); + if (entry & QCOW_OFLAG_COMPRESSED) { + nb_clusters = 1; + } else { + nb_clusters = count_cow_clusters(s, nb_clusters, l2_table, + l2_index + keep_clusters); + } + + ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table); + if (ret < 0) { + return ret; + } + /* Calculate start and size of allocation */ alloc_offset = offset + keep_bytes;