[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 02/38] block: Set BDRV_O_INCOMING in bdrv_fill_op
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 02/38] block: Set BDRV_O_INCOMING in bdrv_fill_options() |
Date: |
Fri, 18 Sep 2015 17:22:37 +0200 |
This flag should not be set for the root BDS only, but for any BDS that
is being created while incoming migration is pending, so setting it is
moved from blockdev_init() to bdrv_fill_options().
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 4 ++++
blockdev.c | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 6268e37..51d8c51 100644
--- a/block.c
+++ b/block.c
@@ -1076,6 +1076,10 @@ static int bdrv_fill_options(QDict **options, const char
**pfilename,
}
}
+ if (runstate_check(RUN_STATE_INMIGRATE)) {
+ *flags |= BDRV_O_INCOMING;
+ }
+
return 0;
}
diff --git a/blockdev.c b/blockdev.c
index 32b04b4..ab6eaea 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -539,10 +539,6 @@ static BlockBackend *blockdev_init(const char *file, QDict
*bs_opts,
bdrv_flags |= BDRV_O_COPY_ON_READ;
}
- if (runstate_check(RUN_STATE_INMIGRATE)) {
- bdrv_flags |= BDRV_O_INCOMING;
- }
-
bdrv_flags |= ro ? 0 : BDRV_O_RDWR;
blk = blk_new_open(qemu_opts_id(opts), file, NULL, bs_opts, bdrv_flags,
--
2.5.2
- [Qemu-block] [PATCH v5 00/38] blockdev: BlockBackend and media, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 01/38] block: Remove host floppy support, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 02/38] block: Set BDRV_O_INCOMING in bdrv_fill_options(),
Max Reitz <=
- [Qemu-block] [PATCH v5 03/38] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 05/38] block: Make bdrv_is_inserted() return a bool, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 06/38] block: Add blk_is_available(), Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 04/38] iotests: Only create BB if necessary, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 07/38] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 09/38] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/09/18