diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-01-13 15:56:06 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-01-20 13:36:23 +0100 |
| commit | 04c01a5c8f006b6e45fa5be8ea857efe7d9c41f9 (patch) | |
| tree | a564093ac2a06eb941504e037e3c4a19623f6736 /block/qed.c | |
| parent | 23c88b24721ee907639705bf9de03dcd6b1e66ad (diff) | |
block: Rename BDRV_O_INCOMING to BDRV_O_INACTIVE
Instead of covering only the state of images on the migration
destination before the migration is completed, the flag will also cover
the state of images on the migration source after completion. This
common state implies that the image is technically still open, but no
writes will happen and any cached contents will be reloaded from disk if
and when the image leaves this state.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/qed.c')
| -rw-r--r-- | block/qed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/qed.c b/block/qed.c index 093d6e57d7..0c870cd90f 100644 --- a/block/qed.c +++ b/block/qed.c @@ -478,7 +478,7 @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags, * feature is no longer valid. */ if ((s->header.autoclear_features & ~QED_AUTOCLEAR_FEATURE_MASK) != 0 && - !bdrv_is_read_only(bs->file->bs) && !(flags & BDRV_O_INCOMING)) { + !bdrv_is_read_only(bs->file->bs) && !(flags & BDRV_O_INACTIVE)) { s->header.autoclear_features &= QED_AUTOCLEAR_FEATURE_MASK; ret = qed_write_header_sync(s); @@ -506,7 +506,7 @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags, * aid data recovery from an otherwise inconsistent image. */ if (!bdrv_is_read_only(bs->file->bs) && - !(flags & BDRV_O_INCOMING)) { + !(flags & BDRV_O_INACTIVE)) { BdrvCheckResult result = {0}; ret = qed_check(s, &result, true); |