]> git.proxmox.com Git - mirror_qemu.git/commit - vl.c
spice: fix broken initialization
authorAlon Levy <alevy@redhat.com>
Wed, 14 Mar 2012 18:33:37 +0000 (20:33 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 19 Mar 2012 12:12:19 +0000 (13:12 +0100)
commitad1be89948f88e89708b04ccd782456ccec3a6f0
treefd16e902191c6e0a0ba6f461809c24d535f7c24f
parent5dba0d453d238c283ac3cd2db810c843f9b822b7
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 <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
ui/spice-core.c
vl.c