summaryrefslogtreecommitdiffstats
path: root/softmmu
diff options
context:
space:
mode:
authorPaolo Bonzini2020-10-27 09:26:14 +0100
committerPaolo Bonzini2020-12-10 18:15:14 +0100
commitcca686b44aa1315df4cda4dee56ca601050fab71 (patch)
treee4ad42d6ee62ab61b100f44d3a1560ff20dc7b51 /softmmu
parentvl: initialize displays before preconfig loop (diff)
downloadqemu-cca686b44aa1315df4cda4dee56ca601050fab71.tar.gz
qemu-cca686b44aa1315df4cda4dee56ca601050fab71.tar.xz
qemu-cca686b44aa1315df4cda4dee56ca601050fab71.zip
vl: move -global check earlier
The check has the same effect here, it only matters that it is performed once all devices, both builtin and user-specified, have been created. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'softmmu')
-rw-r--r--softmmu/vl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 6a2972938d..e65eb0c9f2 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3490,6 +3490,8 @@ static void qemu_machine_creation_done(void)
net_check_clients();
}
+ qdev_prop_check_globals();
+
if (boot_once) {
qemu_boot_set(boot_once, &error_fatal);
qemu_register_reset(restore_boot_order, g_strdup(boot_order));
@@ -4547,7 +4549,6 @@ void qemu_init(int argc, char **argv, char **envp)
replay_vmstate_init();
}
- qdev_prop_check_globals();
if (vmstate_dump_file) {
/* dump and exit */
dump_vmstate_json_to_file(vmstate_dump_file);