From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKX4y-000377-Ob for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:50:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKX4x-0001C9-85 for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:50:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKX4w-0001Bv-Tn for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:50:31 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2QGoSuB024374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 26 Mar 2013 12:50:30 -0400 From: Kevin Wolf Date: Tue, 26 Mar 2013 17:49:59 +0100 Message-Id: <1364316613-31223-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1364316613-31223-1-git-send-email-kwolf@redhat.com> References: <1364316613-31223-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 07/21] qcow2: Decouple cluster allocation from cluster reuse code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com 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 --- 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; -- 1.8.1.4