From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVqE-0004cj-29 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVq6-0007QE-Ro for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:53 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43318 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVq6-0007Pz-KK for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:46 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 16 Jan 2013 17:24:57 +0100 Message-Id: <1358353497-5292-37-git-send-email-benoit@irqsave.net> In-Reply-To: <1358353497-5292-1-git-send-email-benoit@irqsave.net> References: <1358353497-5292-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V5 36/36] qcow2: Enable the deduplication feature. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com --- block/qcow2.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index bd7579a..753fce0 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -542,6 +542,13 @@ static int qcow2_open(BlockDriverState *bs, int flags) } } + if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) { + ret = qcow2_dedup_init(bs); + if (ret < 0) { + goto fail; + } + } + #ifdef DEBUG_ALLOC { BdrvCheckResult result = {0}; @@ -1011,11 +1018,11 @@ fail: static void qcow2_close(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; + g_free(s->l1_table); if (s->has_dedup) { - qcow2_cache_flush(bs, s->dedup_cluster_cache); - qcow2_cache_destroy(bs, s->dedup_cluster_cache); + qcow2_dedup_close(bs); } qcow2_cache_flush(bs, s->l2_table_cache); @@ -1509,8 +1516,10 @@ static int qcow2_create2(const char *filename, int64_t total_size, } /* minimal init */ - s->dedup_cluster_cache = qcow2_cache_create(bs, DEDUP_CACHE_SIZE, - s->hash_block_size); + ret = qcow2_dedup_init(bs); + if (ret < 0) { + goto out; + } } /* Want a backing file? There you go.*/ -- 1.7.10.4