From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 21 Mar 2012 16:52:03 +0100 Message-Id: <1332345124-381-7-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> References: <1332345124-381-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH V2 6/7] qed: honor BDRV_O_INCOMING for incoming live migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com >>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); -- 1.7.7.6