From patchwork Wed Mar 21 15:52:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 148035 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 A821DB6F62 for ; Thu, 22 Mar 2012 03:20:04 +1100 (EST) Received: from localhost ([::1]:44768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SANqY-0001eZ-Et for incoming@patchwork.ozlabs.org; Wed, 21 Mar 2012 11:53:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SANpk-0007jr-1m for qemu-devel@nongnu.org; Wed, 21 Mar 2012 11:52:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SANpc-00033q-T2 for qemu-devel@nongnu.org; Wed, 21 Mar 2012 11:52:19 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:38839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SANpc-00030a-K6 for qemu-devel@nongnu.org; Wed, 21 Mar 2012 11:52:12 -0400 Received: by mail-we0-f173.google.com with SMTP id p12so1247258wer.4 for ; Wed, 21 Mar 2012 08:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/b7rofGvSBjNOkS7I+LC6KZPgMkiNFTs6Q4mbMUwBq8=; b=DL0KArw/3o07NyLD5lZi215Z/tZ4SaVszvi4VgnBmralwDyca5jnWJ66MKtONJob8J 5o4iuLTKX8vPYRRwX+uZUFfxhgc2dthREZPsajQG367k8Fblc1AG7vAznx8SyYgJAp50 rht+isfbVVYT4t97bWyU8ThdVzFqV+C2AsXzjL38TQzW9GzIahiqLd2mcVZcIfHEXxTA 1WzAihkRjcyuB3TkovkiIL93+YIiNjiM14Z2KgnDiJwaQTqzn6lP9PAMiCMN2u4xKiso iGIBj57hlzvSbb3RFKOjRHzS37iyYKSygNHOSjbp3Uv83o4NkrNpkRYq9v1GNTvDaTzm iJdg== Received: by 10.216.136.202 with SMTP id w52mr2579222wei.109.1332345131602; Wed, 21 Mar 2012 08:52:11 -0700 (PDT) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id k6sm5430352wiy.7.2012.03.21.08.52.10 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Mar 2012 08:52:11 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2012 16:52:03 +0100 Message-Id: <1332345124-381-7-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> References: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH V2 6/7] qed: honor BDRV_O_INCOMING for incoming live migration 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 original commit with Patchwork-id: 31108 by Stefan Hajnoczi "The QED image format includes a file header bit to mark images dirty. QED normally checks dirty images on open and fixes inconsistent metadata. This is undesirable during live migration since the dirty bit may be set if the source host is modifying the image file. The check should be postponed until migration completes. Skip operations that modify the image file if the BDRV_O_INCOMING flag is set." Signed-off-by: Benoit Canet --- block/qed.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qed.c b/block/qed.c index c47272c..4c04bc9 100644 --- a/block/qed.c +++ b/block/qed.c @@ -454,7 +454,7 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) * feature is no longer valid. */ if ((s->header.autoclear_features & ~QED_AUTOCLEAR_FEATURE_MASK) != 0 && - !bdrv_is_read_only(bs->file)) { + !bdrv_is_read_only(bs->file) && !(bs->open_flags & BDRV_O_INCOMING)) { s->header.autoclear_features &= QED_AUTOCLEAR_FEATURE_MASK; ret = qed_write_header_sync(s); @@ -481,7 +481,8 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) * potentially inconsistent images to be opened read-only. This can * aid data recovery from an otherwise inconsistent image. */ - if (!bdrv_is_read_only(bs->file)) { + if (!bdrv_is_read_only(bs->file) && + !(bs->open_flags & BDRV_O_INCOMING)) { BdrvCheckResult result = {0}; ret = qed_check(s, &result, true);