From ad1be89948f88e89708b04ccd782456ccec3a6f0 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Wed, 14 Mar 2012 20:33:37 +0200 Subject: spice: fix broken initialization Commit 1b71f7c14fab6f00c2680d4489fbee7baf796e4f 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 Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ui') diff --git a/ui/spice-core.c b/ui/spice-core.c index 80535b6..a468524 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -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) -- cgit v1.1