[Qemu-devel] [PATCH important] spice: fix broken initialization

[Qemu-devel] [PATCH important] spice: fix broken initialization

[Alon Levy]

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 <alevy@redhat.com>
---
 ui/spice-core.c |    9 +--------
 vl.c            |    5 +++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index c1091e1..25bbf49 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -553,7 +553,7 @@ void qemu_spice_init(void)
 
     qemu_thread_get_self(&me);
 
-   if (!opts) {
+    if (!opts) {
         return;
     }
     port = qemu_opt_get_number(opts, "port", 0);
@@ -781,10 +781,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)
diff --git a/vl.c b/vl.c
index bd95539..eeb634b 100644
--- a/vl.c
+++ b/vl.c
@@ -3369,6 +3369,11 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     }
 
+#ifdef CONFIG_SPICE
+    /* spice needs the timers to be initialized by this point */
+    qemu_spice_init();
+#endif
+
     if (icount_option && (kvm_enabled() || xen_enabled())) {
         fprintf(stderr, "-icount is not allowed with kvm or xen\n");
         exit(1);
-- 
1.7.9.3

Re: [Qemu-devel] [PATCH important] spice: fix broken initialization

[Gerd Hoffmann]

On 03/14/12 19:33, Alon Levy wrote:
> 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.

Patch added to spice patch queue.

thanks,
  Gerd