From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upfrf-0004Uu-4B for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:29:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpfrY-0001lU-Rx for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:29:30 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:37622 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpfrY-0001lO-JB for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:29:24 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Thu, 20 Jun 2013 16:26:31 +0200 Message-Id: <1371738392-9594-24-git-send-email-benoit@irqsave.net> In-Reply-To: <1371738392-9594-1-git-send-email-benoit@irqsave.net> References: <1371738392-9594-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V8 23/24] 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, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com --- block/qcow2.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index f7b94dd..bb7bf74 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -569,6 +569,13 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags) goto fail; } + if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) { + ret = qcow2_dedup_init(bs); + if (ret < 0) { + goto fail; + } + } + #ifdef DEBUG_ALLOC { BdrvCheckResult result = {0}; @@ -1043,8 +1050,13 @@ fail: static void qcow2_close(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; + g_free(s->l1_table); + if (s->has_dedup) { + qcow2_dedup_close(bs); + } + qcow2_cache_flush(bs, s->l2_table_cache); qcow2_cache_flush(bs, s->refcount_block_cache); @@ -1547,6 +1559,11 @@ static int qcow2_create2(const char *filename, int64_t total_size, } qcow2_store_cleanup(&s->key_value_store); + + ret = qcow2_dedup_init(bs); + if (ret < 0) { + goto out; + } } /* Want a backing file? There you go.*/ -- 1.7.10.4