[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 6/7] qed: honor BDRV_O_INCOMING for incoming live
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH V2 6/7] qed: honor BDRV_O_INCOMING for incoming live migration |
Date: |
Wed, 21 Mar 2012 16:52:03 +0100 |
>From original commit with Patchwork-id: 31108 by
Stefan Hajnoczi <address@hidden>
"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 <address@hidden>
---
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
- [Qemu-devel] [PATCH V2 0/7] Make QED with live migration safe, Benoît Canet, 2012/03/21
- [Qemu-devel] [PATCH V2 2/7] block: add a function to clear incoming live migration flags, Benoît Canet, 2012/03/21
- [Qemu-devel] [PATCH V2 1/7] block: Add new BDRV_O_INCOMING flag to notice incoming live migration, Benoît Canet, 2012/03/21
- [Qemu-devel] [PATCH V2 7/7] qed: remove incoming live migration blocker, Benoît Canet, 2012/03/21
- [Qemu-devel] [PATCH V2 3/7] blockdev: open images with BDRV_O_INCOMING on incoming live migration, Benoît Canet, 2012/03/21
- [Qemu-devel] [PATCH V2 6/7] qed: honor BDRV_O_INCOMING for incoming live migration,
Benoît Canet <=
- [Qemu-devel] [PATCH V2 5/7] migration: clear BDRV_O_INCOMING flags on end of incoming live migration, Benoît Canet, 2012/03/21
- [Qemu-devel] [PATCH V2 4/7] qed: add bdrv_invalidate_cache to be called after incoming live migration, Benoît Canet, 2012/03/21