|
@@ -4276,10 +4276,17 @@ int main(int argc, char **argv, char **envp)
|
|
exit(0);
|
|
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
|
|
* Note: we need to create block backends before
|
|
* machine_set_property(), so machine properties can refer to
|
|
* 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);
|
|
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);
|
|
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) {
|
|
if (qtest_chrdev) {
|
|
qtest_init(qtest_chrdev, qtest_log, &error_fatal);
|
|
qtest_init(qtest_chrdev, qtest_log, &error_fatal);
|
|
}
|
|
}
|