From patchwork Wed Dec 23 07:46:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 560385 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B4449140BC1 for ; Wed, 23 Dec 2015 18:52:01 +1100 (AEDT) Received: from localhost ([::1]:54769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBeDH-0004GO-ME for incoming@patchwork.ozlabs.org; Wed, 23 Dec 2015 02:51:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBe8k-0004Pj-Re for qemu-devel@nongnu.org; Wed, 23 Dec 2015 02:47:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBe8j-0006mq-W6 for qemu-devel@nongnu.org; Wed, 23 Dec 2015 02:47:18 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:35942 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBe8j-0006lZ-K7 for qemu-devel@nongnu.org; Wed, 23 Dec 2015 02:47:17 -0500 Received: from irbis.sw.ru ([10.30.2.139]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id tBN7kuRd003382; Wed, 23 Dec 2015 10:47:05 +0300 (MSK) From: "Denis V. Lunev" To: Date: Wed, 23 Dec 2015 10:46:55 +0300 Message-Id: <1450856816-9816-5-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450856816-9816-1-git-send-email-den@openvz.org> References: <567A4EB0.1040807@parallels.com> <1450856816-9816-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Max Reitz , Olga Krishtal , "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 4/5] qcow2: implemented bdrv_is_opened_unclean 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 From: Olga Krishtal While opening image we save dirty state in header_unclean. If the image was closed incorrectly we can retrieve this fact using bdrv_is_opened_unclean callback. This is necessary in case when we want to call brdv_check to repair dirty image. Signed-off-by: Olga Krishtal Signed-off-by: Denis V. Lunev CC: Kevin Wolf CC: Max Reitz CC: Eric Blake CC: Fam Zheng --- block/qcow2.c | 11 ++++++++++- block/qcow2.h | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 1789af4..de3b97f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -817,6 +817,11 @@ static int qcow2_update_options(BlockDriverState *bs, QDict *options, return ret; } +static bool qcow2_is_opened_unclean(BlockDriverState *bs) +{ + return ((BDRVQcow2State *)(bs->opaque))->header_unclean; +} + static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -1156,7 +1161,6 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, if (!(flags & (BDRV_O_CHECK | BDRV_O_INCOMING)) && !bs->read_only && (s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) { BdrvCheckResult result = {0}; - ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS); if (ret < 0) { error_setg_errno(errp, -ret, "Could not repair dirty image"); @@ -1170,6 +1174,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, qcow2_check_refcounts(bs, &result, 0); } #endif + if (flags & BDRV_O_RDWR) { + s->header_unclean = true; + } return ret; fail: @@ -1691,6 +1698,7 @@ static void qcow2_close(BlockDriverState *bs) qemu_vfree(s->l1_table); /* else pre-write overlap checks in cache_destroy may crash */ s->l1_table = NULL; + s->header_unclean = false; if (!(bs->open_flags & BDRV_O_INCOMING)) { int ret1, ret2; @@ -3305,6 +3313,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_co_get_block_status = qcow2_co_get_block_status, .bdrv_set_key = qcow2_set_key, + .bdrv_is_opened_unclean = qcow2_is_opened_unclean, .bdrv_co_readv = qcow2_co_readv, .bdrv_co_writev = qcow2_co_writev, .bdrv_co_flush_to_os = qcow2_co_flush_to_os, diff --git a/block/qcow2.h b/block/qcow2.h index a063a3c..c743d66 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -278,6 +278,7 @@ typedef struct BDRVQcow2State { int overlap_check; /* bitmask of Qcow2MetadataOverlap values */ bool signaled_corruption; + bool header_unclean; uint64_t incompatible_features; uint64_t compatible_features; uint64_t autoclear_features;