[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 07/12] vl: Fix to create migration object before bloc
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 07/12] vl: Fix to create migration object before block backends again |
Date: |
Tue, 19 Mar 2019 16:46:15 +0100 |
From: Markus Armbruster <address@hidden>
Recent commit cda4aa9a5a0 moved block backend creation before machine
property evaluation. This broke qemu-iotests 055. Turns out we need
to create the migration object before block backends, so block
backends can add migration blockers. Fix by calling
migration_object_init() earlier, right before configure_blockdev().
Fixes: cda4aa9a5a08777cf13e164c0543bd4888b8adce
Reported-by: Kevin Wolf <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
vl.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/vl.c b/vl.c
index c1d5484e12..d61d5604e5 100644
--- a/vl.c
+++ b/vl.c
@@ -4276,10 +4276,17 @@ int main(int argc, char **argv, char **envp)
exit(0);
}
+ /*
+ * Migration object can only be created after global properties
+ * are applied correctly.
+ */
+ migration_object_init();
+
/*
* Note: we need to create block backends before
* machine_set_property(), so machine properties can refer to
- * them.
+ * them, and after migration_object_init(), so we can create
+ * migration blockers.
*/
configure_blockdev(&bdo_queue, machine_class, snapshot);
@@ -4297,12 +4304,6 @@ int main(int argc, char **argv, char **envp)
machine_class->name, machine_class->deprecation_reason);
}
- /*
- * Migration object can only be created after global properties
- * are applied correctly.
- */
- migration_object_init();
-
if (qtest_chrdev) {
qtest_init(qtest_chrdev, qtest_log, &error_fatal);
}
--
2.20.1
- [Qemu-block] [PULL 00/12] Block layer patches, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 03/12] qapi: fix block-latency-histogram-set description and examples, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 01/12] mirror: Confirm we're quiesced only if the job is paused or cancelled, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 06/12] iotests: 153: Wait for an answer to QMP commands, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 05/12] block: Silence Coverity in bdrv_drop_intermediate(), Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 07/12] vl: Fix to create migration object before block backends again,
Kevin Wolf <=
- [Qemu-block] [PULL 02/12] qcow2: Fix data file error condition in qcow2_co_create(), Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 04/12] vmdk: Support version=3 in VMDK descriptor files, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 09/12] blockjob: fix user pause in block_job_error_action, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 08/12] qemu-iotests: Fix 232 for non-qcow2, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 12/12] qemu-iotests: Treat custom TEST_DIR in 051, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 10/12] block: Make bdrv_{copy_on_read, crypto_luks, replication} static, Kevin Wolf, 2019/03/19
- [Qemu-block] [PULL 11/12] blockdev: Check @replaces in blockdev_mirror_common, Kevin Wolf, 2019/03/19
- Re: [Qemu-block] [PULL 00/12] Block layer patches, Peter Maydell, 2019/03/19