From patchwork Fri Mar 15 14:49:46 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: 228039 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 659A62C00A7 for ; Sat, 16 Mar 2013 02:05:40 +1100 (EST) Received: from localhost ([::1]:37898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGW5b-0004ja-BD for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2013 10:58:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVzt-0003FB-3V for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:52:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGVzm-0005Lv-LM for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:52:41 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:59652 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVzm-0005Lf-AR for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:52:34 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 6D3A9874355; Fri, 15 Mar 2013 15:52:33 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 1A30F87436C; Fri, 15 Mar 2013 15:48:49 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2013 15:49:46 +0100 Message-Id: <1363358986-8360-33-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net> References: <1363358986-8360-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, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V7 32/32] 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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 96fc86a..135c71e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -531,6 +531,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}; @@ -1006,8 +1013,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); @@ -1498,6 +1510,12 @@ static int qcow2_create2(const char *filename, int64_t total_size, if (ret < 0) { goto out; } + + /* minimal init */ + ret = qcow2_dedup_init(bs); + if (ret < 0) { + goto out; + } } /* Want a backing file? There you go.*/