From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVxC-0006ug-G9 for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:50:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGVx5-0004Gw-Vy for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:49:54 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:59546 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVx5-0004Gh-Bi for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:49:47 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Mar 2013 15:49:20 +0100 Message-Id: <1363358986-8360-7-git-send-email-benoit@irqsave.net> In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net> References: <1363358986-8360-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V7 06/32] qcow2: Make qcow2_update_cluster_refcount public. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Also add it a flush parameter. Signed-off-by: Benoit Canet --- block/qcow2-refcount.c | 28 ++++++++++++++++++++-------- block/qcow2.h | 4 ++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 55543ed..e12b58c 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -510,13 +510,15 @@ fail: /* * Increases or decreases the refcount of a given cluster by one. * addend must be 1 or -1. + * flush must be true if flushing is needed * * If the return value is non-negative, it is the new refcount of the cluster. * If it is negative, it is -errno and indicates an error. */ -static int update_cluster_refcount(BlockDriverState *bs, - int64_t cluster_index, - int addend) +int qcow2_update_cluster_refcount(BlockDriverState *bs, + int64_t cluster_index, + int addend, + bool flush) { BDRVQcowState *s = bs->opaque; int ret; @@ -526,7 +528,9 @@ static int update_cluster_refcount(BlockDriverState *bs, return ret; } - bdrv_flush(bs->file); + if (flush) { + bdrv_flush(bs->file); + } return get_refcount(bs, cluster_index); } @@ -645,7 +649,8 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) if (free_in_cluster == 0) s->free_byte_offset = 0; if ((offset & (s->cluster_size - 1)) != 0) - update_cluster_refcount(bs, offset >> s->cluster_bits, 1); + qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, 1, + true); } else { offset = qcow2_alloc_clusters(bs, s->cluster_size); if (offset < 0) { @@ -655,7 +660,8 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) if ((cluster_offset + s->cluster_size) == offset) { /* we are lucky: contiguous data */ offset = s->free_byte_offset; - update_cluster_refcount(bs, offset >> s->cluster_bits, 1); + qcow2_update_cluster_refcount(bs, offset >> s->cluster_bits, 1, + true); s->free_byte_offset += size; } else { s->free_byte_offset = offset; @@ -792,7 +798,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, } else { uint64_t cluster_index = (offset & L2E_OFFSET_MASK) >> s->cluster_bits; if (addend != 0) { - refcount = update_cluster_refcount(bs, cluster_index, addend); + refcount = qcow2_update_cluster_refcount(bs, + cluster_index, + addend, + true); } else { refcount = get_refcount(bs, cluster_index); } @@ -824,7 +833,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, if (addend != 0) { - refcount = update_cluster_refcount(bs, l2_offset >> s->cluster_bits, addend); + refcount = qcow2_update_cluster_refcount(bs, + l2_offset >> s->cluster_bits, + addend, + true); } else { refcount = get_refcount(bs, l2_offset >> s->cluster_bits); } diff --git a/block/qcow2.h b/block/qcow2.h index 6c45520..3dc9834 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -410,6 +410,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix); +int qcow2_update_cluster_refcount(BlockDriverState *bs, + int64_t cluster_index, + int addend, + bool flush); /* qcow2-cluster.c functions */ int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size); -- 1.7.10.4