From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yG9-0001JO-GO for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4yFk-00055p-57 for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:13 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:54954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yFj-00053S-Si for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:32:48 -0500 Received: by mail-wi0-f173.google.com with SMTP id hi18so3485888wib.4 for ; Tue, 06 Mar 2012 09:32:47 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 6 Mar 2012 18:32:28 +0100 Message-Id: <1331055149-10982-10-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> References: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [RFC PATCH 09/10] 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: pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com, wolf@redhat.com >>From original commit is 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 f6300af..4bfda24 100644 --- a/block/qed.c +++ b/block/qed.c @@ -378,7 +378,8 @@ static int check_image_if_needed(BlockDriverState *bs) * 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); @@ -481,7 +482,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) && !(flags & BDRV_O_INCOMING)) { s->header.autoclear_features &= QED_AUTOCLEAR_FEATURE_MASK; ret = qed_write_header_sync(s); -- 1.7.7.6