Currently drive_init_func() may call migrate_get_current() while the migrate object is still not ready yet at that time. Move the migration object init earlier, along with the global properties, right after acceleration init.
This fixes a breakage for iotest 055, which caused an assertion failure. Reported-by: Max Reitz <mre...@redhat.com> Reported-by: Philippe Mathieu-Daudé <f4...@amsat.org> Fixes: 3df663 ("migration: move only_migratable to MigrationState") Signed-off-by: Peter Xu <pet...@redhat.com> --- vl.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/vl.c b/vl.c index 0c497a3..2ae4313 100644 --- a/vl.c +++ b/vl.c @@ -4414,6 +4414,18 @@ int main(int argc, char **argv, char **envp) configure_accelerator(current_machine); + /* + * Register all the global properties, including accel properties, + * machine properties, and user-specified ones. + */ + register_global_properties(current_machine); + + /* + * 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); } @@ -4595,18 +4607,6 @@ int main(int argc, char **argv, char **envp) exit (i == 1 ? 1 : 0); } - /* - * Register all the global properties, including accel properties, - * machine properties, and user-specified ones. - */ - register_global_properties(current_machine); - - /* - * Migration object can only be created after global properties - * are applied correctly. - */ - migration_object_init(); - /* This checkpoint is required by replay to separate prior clock reading from the other reads, because timer polling functions query clock values from the log. */ -- 2.7.4