[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/19] qemu-char: move text console init to console.
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 17/19] qemu-char: move text console init to console.c |
Date: |
Mon, 18 Feb 2013 15:48:14 -0600 |
Signed-off-by: Anthony Liguori <address@hidden>
---
include/ui/console.h | 1 -
qemu-char.c | 1 -
ui/console.c | 9 ++++++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index fc23baa..abc8652 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -442,7 +442,6 @@ void vga_hw_text_update(console_ch_t *chardata);
int is_graphic_console(void);
int is_fixedsize_console(void);
-CharDriverState *text_console_init(QemuOpts *opts);
void text_consoles_set_display(DisplayState *ds);
void console_select(unsigned int index);
void console_color_init(DisplayState *ds);
diff --git a/qemu-char.c b/qemu-char.c
index 3a2f279..e533ef1 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3658,7 +3658,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", text_console_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 0a68836..71dda4a 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1532,7 +1532,7 @@ static void text_console_do_init(CharDriverState *chr,
DisplayState *ds)
chr->init(chr);
}
-CharDriverState *text_console_init(QemuOpts *opts)
+static CharDriverState *text_console_init(QemuOpts *opts)
{
CharDriverState *chr;
QemuConsole *s;
@@ -1722,3 +1722,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);
--
1.8.0
- Re: [Qemu-devel] [PATCH 10/19] char: add gio watch fn for tcp backends, (continued)
[Qemu-devel] [PATCH 11/19] qemu-char: use a glib timeout instead of qemu-timer, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 12/19] qemu-char: remove use of QEMUTimer in favor of glib idle function, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 13/19] qemu-char: make char drivers dynamically registerable, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 14/19] qemu-char: move spice registration to spice-qemu-char.c, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 19/19] virtio: console: add flow control, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 18/19] serial: add flow control to transmit, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 15/19] qemu-char: move baum registration to baum.c, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 16/19] qemu-char: move msmouse registeration to msmouse.c, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 17/19] qemu-char: move text console init to console.c,
Anthony Liguori <=
[Qemu-devel] [PATCH 02/19] qemu-char: remove dead/confusing logic with nb_stdio_clients, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 04/19] qemu-char: convert fd_chr to use a GIOChannel, Anthony Liguori, 2013/02/18
[Qemu-devel] [PATCH 05/19] qemu-char: convert pty to GIOChannel, Anthony Liguori, 2013/02/19
Re: [Qemu-devel] [PATCH 00/19] chardev flow control, Amit Shah, 2013/02/19
Re: [Qemu-devel] [PATCH 00/19] chardev flow control, Hans de Goede, 2013/02/19
[Qemu-devel] [PATCH 03/19] char: add IOWatchPoll support, Anthony Liguori, 2013/02/19
[Qemu-devel] [PATCH 01/19] char-socket: fix error reporting, Anthony Liguori, 2013/02/19