From patchwork Thu Jun 20 14:26:30 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: 252961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4EFA22C00A3 for ; Fri, 21 Jun 2013 00:39:10 +1000 (EST) Received: from localhost ([::1]:47708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upg0y-0000pz-F9 for incoming@patchwork.ozlabs.org; Thu, 20 Jun 2013 10:39:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpfrR-0004Cz-Ks for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:29:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpfrL-0001i6-Bb for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:29:17 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:37617 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpfrL-0001hu-0g for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:29:11 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 639AC874674; Thu, 20 Jun 2013 16:29:10 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id D3EAC874681; Thu, 20 Jun 2013 16:25:01 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2013 16:26:30 +0200 Message-Id: <1371738392-9594-23-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371738392-9594-1-git-send-email-benoit@irqsave.net> References: <1371738392-9594-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 V8 22/24] qcow2: Add qcow2_dedup_init and qcow2_dedup_close. 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 Signed-off-by: Benoit Canet --- block/qcow2-dedup.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 2 +- block/qcow2.h | 2 ++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 606459f..5eeea38 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -716,3 +716,63 @@ void qcow2_dedup_destroy_hash(BlockDriverState *bs, free_exit: qemu_vfree(buf); } + +int qcow2_dedup_init(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + int ret = 0; + + s->has_dedup = true; + + /* if we are read-only we don't init anything */ + if (bs->read_only) { + return 0; + } + + /* no need to allocate the various store's buffers since qcow2_store_load + * will do it + */ + + /* load and parse the configuration from disk */ + ret = qcow2_store_load(bs, &s->key_value_store); + + if (ret < 0) { + return ret; + } + + /* if QEMU crashed forget everyting that was stored in the store */ + if(s->dedup_dirty) { + qcow2_store_forget(bs, &s->key_value_store); + } + + /* set the dirty bit */ + s->dedup_dirty = true; + qcow2_update_header(bs); + + /* load the journal and the incarnations in a coroutine */ + return qcow2_store_start(bs, &s->key_value_store); +} + +void qcow2_dedup_close(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + int ret = 0; + + /* if we are read-only we don't need to cleanup */ + if (bs->read_only) { + return; + } + + ret = qcow2_store_flush(bs, &s->key_value_store); + + qcow2_store_cleanup(&s->key_value_store); + + /* flush failed -> leave the store dirty so it will be discard at restart */ + if (ret < 0) { + return; + } + + /* clear the dirty bit */ + s->dedup_dirty = false; + qcow2_update_header(bs); +} diff --git a/block/qcow2.c b/block/qcow2.c index ea2f0f2..f7b94dd 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1546,7 +1546,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, goto out; } - qcow2_store_cleanup(bs, &s->key_value_store); + qcow2_store_cleanup(&s->key_value_store); } /* Want a backing file? There you go.*/ diff --git a/block/qcow2.h b/block/qcow2.h index 3c6e685..b293be7 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -751,5 +751,7 @@ int qcow2_dedup_store_new_hashes(BlockDriverState *bs, uint64_t physical_sect); void qcow2_dedup_destroy_hash(BlockDriverState *bs, uint64_t cluster_index); +int qcow2_dedup_init(BlockDriverState *bs); +void qcow2_dedup_close(BlockDriverState *bs); #endif