qemu-char: move text console init to console.c

Signed-off-by: Anthony Liguori <[email protected]>
Signed-off-by: Amit Shah <[email protected]>
Message-id: 17cefde0a8d7807294bab95e93c3328a20d3f2ed.1362505276[email protected]
Signed-off-by: Anthony Liguori <[email protected]>

diff --git a/qemu-char.c b/qemu-char.c
index cf02cabba2d879951b954e9e967b3b79fcea5837..b82d6433d213c2186aa6fc2bb93f54bc6d794f85 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3663,7 +3663,6 @@ static void register_types(void)
     register_char_driver("null", qemu_chr_open_null);
     register_char_driver("socket", qemu_chr_open_socket);
     register_char_driver("udp", qemu_chr_open_udp);
-    register_char_driver("vc", vc_init);
     register_char_driver("memory", qemu_chr_open_ringbuf);
 #ifdef _WIN32
     register_char_driver("file", qemu_chr_open_win_file_out);

diff --git a/ui/console.c b/ui/console.c
index 0d95f321234084f9350431953f43b867a9abf7f8..83a6fa3969aec6fda8d260a318f50fbfcf265c5b 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -1739,3 +1739,10 @@ PixelFormat qemu_default_pixelformat(int bpp)
     }
     return pf;
 }
+
+static void register_types(void)
+{
+    register_char_driver("vc", text_console_init);
+}
+
+type_init(register_types);