From patchwork Wed Jan 16 15:48:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC,V5,36/62] qcow2: Enable the deduplication feature. Date: Wed, 16 Jan 2013 05:48:15 -0000 From: =?utf-8?q?Beno=C3=AEt_Canet_=3Cbenoit=40irqsave=2Enet=3E?= X-Patchwork-Id: 212886 Message-Id: <1358351321-4891-37-git-send-email-benoit@irqsave.net> 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.*/