From patchwork Wed Oct 17 16:00:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 192084 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 1B0252C0098 for ; Thu, 18 Oct 2012 03:08:21 +1100 (EST) Received: from localhost ([::1]:54399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOWAL-00068R-AS for incoming@patchwork.ozlabs.org; Wed, 17 Oct 2012 12:08:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOWAA-000681-92 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:08:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOWA5-0005Td-GO for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:08:06 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48839 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOWA4-0005TO-U1 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:08:01 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id F00358742F0; Wed, 17 Oct 2012 18:06:39 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 522F58742F1; Wed, 17 Oct 2012 18:05:56 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2012 18:00:14 +0200 Message-Id: <1350489629-1838-6-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350489629-1838-1-git-send-email-benoit@irqsave.net> References: <1350489629-1838-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V2 05/20] qcow2: Rename update_refcount into qcow2_update_refcount. 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 Also make it public so qcow2-dedup.c can use it. --- block/qcow2-refcount.c | 38 +++++++++++++++++++------------------- block/qcow2.h | 4 +++- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 5e3f915..692f3fb 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -27,9 +27,6 @@ #include "block/qcow2.h" static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size); -static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, - int64_t offset, int64_t length, - int addend); /*********************************************************/ @@ -188,10 +185,11 @@ static int alloc_refcount_block(BlockDriverState *bs, * recursion. Instead we must place the refcount blocks in a way that * they can describe them themselves. * - * - We need to consider that at this point we are inside update_refcounts - * and doing the initial refcount increase. This means that some clusters - * have already been allocated by the caller, but their refcount isn't - * accurate yet. free_cluster_index tells us where this allocation ends + * - We need to consider that at this point we are inside + * qcow2_update_refcounts and doing the initial refcount increase. + * This means that some clusters have already been allocated by the + * caller, but their refcount isn't accurate yet. + * free_cluster_index tells us where this allocation ends * as long as we don't overwrite it by freeing clusters. * * - alloc_clusters_noref and qcow2_free_clusters may load a different @@ -232,7 +230,7 @@ static int alloc_refcount_block(BlockDriverState *bs, } else { /* Described somewhere else. This can recurse at most twice before we * arrive at a block that describes itself. */ - ret = update_refcount(bs, new_block, s->cluster_size, 1); + ret = qcow2_update_refcount(bs, new_block, s->cluster_size, 1); if (ret < 0) { goto fail_block; } @@ -240,7 +238,7 @@ static int alloc_refcount_block(BlockDriverState *bs, bdrv_flush(bs->file); /* Initialize the new refcount block only after updating its refcount, - * update_refcount uses the refcount cache itself */ + * qcow2_update_refcount uses the refcount cache itself */ ret = qcow2_cache_get_empty(bs, s->refcount_block_cache, new_block, (void**) refcount_block); if (ret < 0) { @@ -412,7 +410,7 @@ fail_block: } /* XXX: cache several refcount block clusters ? */ -static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, +int QEMU_WARN_UNUSED_RESULT qcow2_update_refcount(BlockDriverState *bs, int64_t offset, int64_t length, int addend) { BDRVQcowState *s = bs->opaque; @@ -422,8 +420,8 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, int ret; #ifdef DEBUG_ALLOC2 - fprintf(stderr, "update_refcount: offset=%" PRId64 " size=%" PRId64 " addend=%d\n", - offset, length, addend); + fprintf(stderr, "qcow2_update_refcount: offset=%" PRId64 + " size=%" PRId64 " addend=%d\n", offset, length, addend); #endif if (length < 0) { return -EINVAL; @@ -499,7 +497,8 @@ fail: */ if (ret < 0) { int dummy; - dummy = update_refcount(bs, offset, cluster_offset - offset, -addend); + dummy = qcow2_update_refcount(bs, offset, + cluster_offset - offset, -addend); (void)dummy; } @@ -520,7 +519,8 @@ static int update_cluster_refcount(BlockDriverState *bs, BDRVQcowState *s = bs->opaque; int ret; - ret = update_refcount(bs, cluster_index << s->cluster_bits, 1, addend); + ret = qcow2_update_refcount(bs, cluster_index << s->cluster_bits, + 1, addend); if (ret < 0) { return ret; } @@ -574,7 +574,7 @@ int64_t qcow2_alloc_clusters(BlockDriverState *bs, int64_t size) return offset; } - ret = update_refcount(bs, offset, size, 1); + ret = qcow2_update_refcount(bs, offset, size, 1); if (ret < 0) { return ret; } @@ -606,7 +606,7 @@ int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset, old_free_cluster_index = s->free_cluster_index; s->free_cluster_index = cluster_index + i; - ret = update_refcount(bs, offset, i << s->cluster_bits, 1); + ret = qcow2_update_refcount(bs, offset, i << s->cluster_bits, 1); if (ret < 0) { return ret; } @@ -672,7 +672,7 @@ void qcow2_free_clusters(BlockDriverState *bs, int ret; BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_FREE); - ret = update_refcount(bs, offset, size, -1); + ret = qcow2_update_refcount(bs, offset, size, -1); if (ret < 0) { fprintf(stderr, "qcow2_free_clusters failed: %s\n", strerror(-ret)); /* TODO Remember the clusters to free them later and avoid leaking */ @@ -779,7 +779,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, s->csize_mask) + 1; if (addend != 0) { int ret; - ret = update_refcount(bs, + ret = qcow2_update_refcount(bs, (offset & s->cluster_offset_mask) & ~511, nb_csectors * 512, addend); if (ret < 0) { @@ -1213,7 +1213,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, i, refcount1, refcount2); if (num_fixed) { - ret = update_refcount(bs, i << s->cluster_bits, 1, + ret = qcow2_update_refcount(bs, i << s->cluster_bits, 1, refcount2 - refcount1); if (ret >= 0) { (*num_fixed)++; diff --git a/block/qcow2.h b/block/qcow2.h index 6e867c8..77c0f2b 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -292,7 +292,9 @@ int qcow2_update_header(BlockDriverState *bs); /* qcow2-refcount.c functions */ int qcow2_refcount_init(BlockDriverState *bs); void qcow2_refcount_close(BlockDriverState *bs); - +int QEMU_WARN_UNUSED_RESULT qcow2_update_refcount(BlockDriverState *bs, + int64_t offset, int64_t length, + int addend); int64_t qcow2_alloc_clusters(BlockDriverState *bs, int64_t size); int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset, int nb_clusters);