xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-17 10:38:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

softmmu: initialize spice and audio earlier

Browse Source 
audiodev must be initialized before machine_set_property
so the machine can have audiodev property aliases.

spice must initialize before audiodev because the default
audiodev is spice only in case spice is actually enabled.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200702132525.6849-15-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-07-02 15:25:19 +02:00
parent 8859f07279
commit dea1fb887c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
softmmu/vl.c
View File

@ -4131,12 +4131,17 @@ void qemu_init(int argc, char **argv, char **envp)
fsdev_init_func, NULL, &error_fatal); fsdev_init_func, NULL, &error_fatal);
#endif #endif
/* spice needs the timers to be initialized by this point */
/* spice must initialize before audio as it changes the default auiodev */
qemu_spice_init();
/* /*
* Note: we need to create block backends before * Note: we need to create audio and block backends before
* machine_set_property(), so machine properties can refer to * machine_set_property(), so machine properties can refer to
* them. * them.
*/ */
configure_blockdev(&bdo_queue, machine_class, snapshot); configure_blockdev(&bdo_queue, machine_class, snapshot);
audio_init_audiodevs();
machine_opts = qemu_get_machine_opts(); machine_opts = qemu_get_machine_opts();
qemu_opt_foreach(machine_opts, machine_set_property, current_machine, qemu_opt_foreach(machine_opts, machine_set_property, current_machine,
@ -4230,9 +4235,6 @@ void qemu_init(int argc, char **argv, char **envp)
semihosting_arg_fallback(kernel_filename, kernel_cmdline); semihosting_arg_fallback(kernel_filename, kernel_cmdline);
} }
/* spice needs the timers to be initialized by this point */
qemu_spice_init();
cpu_ticks_init(); cpu_ticks_init();
if (default_net) { if (default_net) {
@ -4342,8 +4344,6 @@ void qemu_init(int argc, char **argv, char **envp)
create_default_memdev(current_machine, mem_path); create_default_memdev(current_machine, mem_path);
} }
audio_init_audiodevs();
/* from here on runstate is RUN_STATE_PRELAUNCH */ /* from here on runstate is RUN_STATE_PRELAUNCH */
machine_run_board_init(current_machine); machine_run_board_init(current_machine);