From patchwork Wed Jan 16 15:48:15 2013 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: 212886 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 131AC2C0093 for ; Thu, 17 Jan 2013 04:50:00 +1100 (EST) Received: from localhost ([::1]:58468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVHX-0000IV-D9 for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 10:52:03 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVGx-0007ls-61 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:51:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVGu-0005l2-DI for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:51:27 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:42966 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVGu-0005kw-5A for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:51:24 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 08651874324; Wed, 16 Jan 2013 17:22:59 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id CC12687433D; Wed, 16 Jan 2013 17:19:48 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 16:48:15 +0100 Message-Id: <1358351321-4891-37-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358351321-4891-1-git-send-email-benoit@irqsave.net> References: <1358351321-4891-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V5 36/62] qcow2: Enable the deduplication feature. 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 --- 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.*/