[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] spice: fix broken initialization
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 7/7] spice: fix broken initialization |
Date: |
Mon, 19 Mar 2012 14:30:38 +0100 |
From: Alon Levy <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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 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)
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.1
- [Qemu-devel] [PULL 0/7] spice patch queue, Gerd Hoffmann, 2012/03/19
- [Qemu-devel] [PATCH 4/7] qxl: switch qxl.c to trace-events, Gerd Hoffmann, 2012/03/19
- [Qemu-devel] [PATCH 2/7] monitor: fix client_migrate_info error handling, Gerd Hoffmann, 2012/03/19
- [Qemu-devel] [PATCH 6/7] hw/qxl.c: Fix compilation failures on 32 bit hosts, Gerd Hoffmann, 2012/03/19
- [Qemu-devel] [PATCH 1/7] spice: set spice uuid and name, Gerd Hoffmann, 2012/03/19
- [Qemu-devel] [PATCH 5/7] qxl/qxl_render.c: add trace events, Gerd Hoffmann, 2012/03/19
- [Qemu-devel] [PATCH 3/7] qxl: init_pipe_signaling: exit on failure, Gerd Hoffmann, 2012/03/19
- [Qemu-devel] [PATCH 7/7] spice: fix broken initialization,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 0/7] spice patch queue, Anthony Liguori, 2012/03/19