motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

spice: fix broken initialization

Browse source 
Commit 1b71f7c14f moved MODULE_INIT_QOM to
way before MODULE_INIT_MACHINE, thereby breaking assumptions made in
spice-core.c which registered both a type initializer and a machine
intializer.

This fix removes the type registration, and replaces it with calling
qemu_spice_init in vl.c after command line parsing (second pass) is
done, and after timers are armed, required by spice server.

Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Alon Levy 2012-03-14 20:33:37 +02:00 • committed by Gerd Hoffmann
parent 5dba0d453d
commit ad1be89948
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ui/spice-core.c
View file

@ -554,7 +554,7 @@ void qemu_spice_init(void)
qemu_thread_get_self(&me);
if (!opts) {
if (!opts) {
return;
}
port = qemu_opt_get_number(opts, "port", 0);
@ -787,10 +787,3 @@ static void spice_register_config(void)
qemu_add_opts(&qemu_spice_opts);
}
machine_init(spice_register_config);
static void spice_register_types(void)
{
qemu_spice_init();
}
type_init(spice_register_types)