From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7t1B-0004Ub-Fn for qemu-devel@nongnu.org; Wed, 14 Mar 2012 14:33:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7t15-0004Ji-7r for qemu-devel@nongnu.org; Wed, 14 Mar 2012 14:33:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7t14-0004JT-WB for qemu-devel@nongnu.org; Wed, 14 Mar 2012 14:33:43 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2EIXfdr018979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Mar 2012 14:33:41 -0400 From: Alon Levy Date: Wed, 14 Mar 2012 20:33:37 +0200 Message-Id: <1331750017-1191-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH important] spice: fix broken initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kraxel@redhat.com 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 --- 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