From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 5 Mar 2013 17:51:29 +0000 (+0530)
Subject: qemu-char: move spice registration to spice-qemu-char.c
X-Git-Tag: v1.5.0-rc0~498
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26c60614524f41bc9016cbe27eaefe59473d3461;p=thirdparty%2Fqemu.git

qemu-char: move spice registration to spice-qemu-char.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Message-id: 49a8d12eeb117e5530b2fab02af7681b54f9245c.1362505276.git.amit.shah@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/qemu-char.c b/qemu-char.c
index 9bcdf737cc6..2e9f92e3556 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3690,12 +3690,6 @@ static void register_types(void)
     register_char_driver("parallel", qemu_chr_open_pp);
     register_char_driver("parport", qemu_chr_open_pp);
 #endif
-#ifdef CONFIG_SPICE
-    register_char_driver("spicevmc", qemu_chr_open_spice);
-#if SPICE_SERVER_VERSION >= 0x000c02
-    register_char_driver("spiceport", qemu_chr_open_spice_port);
-#endif
-#endif
 }
 
 type_init(register_types);
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index a4d7de8c4f0..aea3d24e7d0 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -307,3 +307,13 @@ void qemu_spice_register_ports(void)
     }
 }
 #endif
+
+static void register_types(void)
+{
+    register_char_driver("spicevmc", qemu_chr_open_spice);
+#if SPICE_SERVER_VERSION >= 0x000c02
+    register_char_driver("spiceport", qemu_chr_open_spice_port);
+#endif
+}
+
+type_init(register_types);