diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-20 07:43:19 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 16:34:48 -0600 |
| commit | d82831dbc5471d72785c49b33710436af49bf9ca (patch) | |
| tree | 3a04247a25901c16977422d4ab95d96ec4b8a28b | |
| parent | 22bc9a46bda8f5f88626d3fb578f5d55953c9743 (diff) | |
| download | qemu-d82831dbc5471d72785c49b33710436af49bf9ca.zip qemu-d82831dbc5471d72785c49b33710436af49bf9ca.tar.gz qemu-d82831dbc5471d72785c49b33710436af49bf9ca.tar.bz2 | |
console: allow VCs to be overridden by UI
We want to expose VCs using a VteTerminal widget. We need access to provide our
own CharDriverState in order to do this.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-id: 1361367806-4599-3-git-send-email-aliguori@us.ibm.com
| -rw-r--r-- | include/ui/console.h | 6 | ||||
| -rw-r--r-- | qemu-char.c | 2 | ||||
| -rw-r--r-- | ui/console.c | 14 |
3 files changed, 19 insertions, 3 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 18012f1..694994b 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -443,7 +443,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); @@ -451,6 +450,11 @@ void qemu_console_resize(DisplayState *ds, int width, int height); void qemu_console_copy(DisplayState *ds, int src_x, int src_y, int dst_x, int dst_y, int w, int h); +typedef CharDriverState *(VcHandler)(QemuOpts *); + +CharDriverState *vc_init(QemuOpts *opts); +void register_vc_handler(VcHandler *handler); + /* sdl.c */ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame); diff --git a/qemu-char.c b/qemu-char.c index e4b0f53..160decc 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2980,7 +2980,7 @@ static const struct { { .name = "socket", .open = qemu_chr_open_socket }, { .name = "udp", .open = qemu_chr_open_udp }, { .name = "msmouse", .open = qemu_chr_open_msmouse }, - { .name = "vc", .open = text_console_init }, + { .name = "vc", .open = vc_init }, { .name = "memory", .open = qemu_chr_open_ringbuf }, #ifdef _WIN32 { .name = "file", .open = qemu_chr_open_win_file_out }, diff --git a/ui/console.c b/ui/console.c index 25e06a5..0d95f32 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1537,7 +1537,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; @@ -1573,6 +1573,18 @@ CharDriverState *text_console_init(QemuOpts *opts) return chr; } +static VcHandler *vc_handler = text_console_init; + +CharDriverState *vc_init(QemuOpts *opts) +{ + return vc_handler(opts); +} + +void register_vc_handler(VcHandler *handler) +{ + vc_handler = handler; +} + void text_consoles_set_display(DisplayState *ds) { int i; |