From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFowu-0004Zz-E3 for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:50:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFowk-0007Df-6Z for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:50:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFowj-0007B6-VA for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:50:02 -0400 From: Kevin Wolf Date: Thu, 5 Apr 2012 17:52:23 +0200 Message-Id: <1333641144-13612-46-git-send-email-kwolf@redhat.com> In-Reply-To: <1333641144-13612-1-git-send-email-kwolf@redhat.com> References: <1333641144-13612-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 45/46] qed: honor BDRV_O_INCOMING for incoming live migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Beno=C3=AEt Canet >>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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/qed.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qed.c b/block/qed.c index a5e9d57..aea2772 100644 --- a/block/qed.c +++ b/block/qed.c @@ -450,7 +450,7 @@ static int bdrv_qed_open(BlockDriverState *bs, int fl= ags) * feature is no longer valid. */ if ((s->header.autoclear_features & ~QED_AUTOCLEAR_FEATURE_MASK) !=3D= 0 && - !bdrv_is_read_only(bs->file)) { + !bdrv_is_read_only(bs->file) && !(flags & BDRV_O_INCOMING)) { s->header.autoclear_features &=3D QED_AUTOCLEAR_FEATURE_MASK; =20 ret =3D qed_write_header_sync(s); @@ -477,7 +477,8 @@ static int bdrv_qed_open(BlockDriverState *bs, int fl= ags) * 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) && + !(flags & BDRV_O_INCOMING)) { BdrvCheckResult result =3D {0}; =20 ret =3D qed_check(s, &result, true); --=20 1.7.6.5