[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_op
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options() |
Date: |
Mon, 12 Oct 2015 22:00:05 +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>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 4 ++++
blockdev.c | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index f38146e..0ae3fcf 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 6c8cce4..f937526 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.6.1
- Re: [Qemu-devel] [PATCH v6 25/39] blockdev: Pull out blockdev option extraction, (continued)
- [Qemu-devel] [PATCH v6 26/39] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 32/39] blockdev: Implement eject with basic operations, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 30/39] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 31/39] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 37/39] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 38/39] hmp: Add read-only-mode option to change command, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 39/39] iotests: Add test for change-related QMP commands, Max Reitz, 2015/10/12
- Re: [Qemu-devel] [PATCH v6 00/39] blockdev: BlockBackend and media, Kevin Wolf, 2015/10/13
- [Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(),
Max Reitz <=
- [Qemu-devel] [PATCH v6 06/39] block: Add blk_is_available(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 14/39] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 21/39] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 22/39] block: Add blk_insert_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 29/39] blockdev: Add blockdev-close-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 27/39] block: Add blk_remove_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 28/39] blockdev: Add blockdev-open-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 33/39] blockdev: Implement change with basic operations, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 34/39] block: Inquire tray state before tray-moved events, Max Reitz, 2015/10/15