From patchwork Wed Jan 16 16:25: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: 212873 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 7831E2C007A for ; Thu, 17 Jan 2013 04:39:43 +1100 (EST) Received: from localhost ([::1]:43219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrw-0007LC-RH for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 11:29:40 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrX-0006l9-Tm for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVrV-0007wF-0u for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:15 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43413 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrU-0007w0-Pt for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:12 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 558D7874309; Wed, 16 Jan 2013 18:00:49 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 637D4874357; Wed, 16 Jan 2013 17:56:24 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 17:25:15 +0100 Message-Id: <1358353518-5421-10-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358353518-5421-1-git-send-email-benoit@irqsave.net> References: <1358353518-5421-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 V1 09/12] qcow2: Make dedup status persists. 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-dedup.c | 7 +++++++ block/qcow2.c | 5 ++++- block/qcow2.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 93545af..85ef66f 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -1323,6 +1323,8 @@ static void coroutine_fn qcow2_co_dedup_resume(void *opaque) s->dedup_status = QCOW_DEDUP_STARTED; qemu_co_mutex_unlock(&s->lock); + qcow2_update_header(bs); + qcow2_deduplicate_after_resuming(bs); return; @@ -1429,6 +1431,10 @@ int qcow2_dedup_init(BlockDriverState *bs) return 0; } + if (!s->start_dedup) { + return 0; + } + s->dedup_status = QCOW_DEDUP_STARTING; /* resume deduplication */ @@ -1465,6 +1471,7 @@ void qcow2_pause_dedup(BlockDriverState *bs) } s->dedup_status = QCOW_DEDUP_STOPPING; + qcow2_update_header(bs); /* must handle half processed write requests */ qcow2_dedup_reset(bs); s->dedup_status = QCOW_DEDUP_STOPPED; diff --git a/block/qcow2.c b/block/qcow2.c index d5681ad..1e61050 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -168,6 +168,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, s->dedup_table_size = be32_to_cpu(dedup_table_extension.size); s->dedup_hash_algo = dedup_table_extension.hash_algo; + s->start_dedup = dedup_table_extension.strategies & (1 << 2); break; default: @@ -1221,7 +1222,9 @@ int qcow2_update_header(BlockDriverState *bs) dedup_table_extension.size = cpu_to_be32(s->dedup_table_size); dedup_table_extension.hash_algo = s->dedup_hash_algo; dedup_table_extension.strategies |= 1; /* RAM based lookup */ - dedup_table_extension.strategies |= 1 << 2; /* deduplication running */ + if (s->has_dedup && s->dedup_status == QCOW_DEDUP_STARTED) { + dedup_table_extension.strategies |= 1 << 2; + } ret = header_ext_add(buf, QCOW2_EXT_MAGIC_DEDUP_TABLE, &dedup_table_extension, diff --git a/block/qcow2.h b/block/qcow2.h index 2b5a7d4..3fdfe14 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -228,6 +228,7 @@ typedef struct BDRVQcowState { int64_t free_byte_offset; bool has_dedup; + bool start_dedup; QCowDedupStatus dedup_status; QCowHashAlgo dedup_hash_algo; Coroutine *dedup_resume_co;