aboutsummaryrefslogtreecommitdiff
path: root/ui/console.c
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-10-21 23:44:44 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2017-01-27 18:07:59 +0100
commit41ac54b253f41df924c350ef63564df8e1d8ad88 (patch)
treea6d8fdcb913b558c4f5ecc698bd82ae1a195705c /ui/console.c
parent5ebd67030c4e4bc702d07a3e10c909be4520f170 (diff)
downloadqemu-41ac54b253f41df924c350ef63564df8e1d8ad88.zip
qemu-41ac54b253f41df924c350ef63564df8e1d8ad88.tar.gz
qemu-41ac54b253f41df924c350ef63564df8e1d8ad88.tar.bz2
char: allocate CharDriverState as a single object
Use a single allocation for CharDriverState, this avoids extra allocations & pointers, and is a step towards more object-oriented CharDriver. Gtk console is a bit peculiar, gd_vc_chr_set_echo() used to have a temporary VirtualConsole to save the echo bit. Instead now, we consider whether vcd->console is set or not, and restore the echo bit saved in VCDriverState when calling gd_vc_vte_init(). The casts added are temporary, they are replaced with QOM type-safe macros in a later patch in this series. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'ui/console.c')
-rw-r--r--ui/console.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/ui/console.c b/ui/console.c
index f48ba26..495d5a2 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1046,9 +1046,15 @@ void console_select(unsigned int index)
}
}
+typedef struct VCDriverState {
+ CharDriverState parent;
+ QemuConsole *console;
+} VCDriverState;
+
static int console_puts(CharDriverState *chr, const uint8_t *buf, int len)
{
- QemuConsole *s = chr->opaque;
+ VCDriverState *drv = (VCDriverState *)chr;
+ QemuConsole *s = drv->console;
int i;
if (!s->ds) {
@@ -1958,7 +1964,8 @@ int qemu_console_get_height(QemuConsole *con, int fallback)
static void text_console_set_echo(CharDriverState *chr, bool echo)
{
- QemuConsole *s = chr->opaque;
+ VCDriverState *drv = (VCDriverState *)chr;
+ QemuConsole *s = drv->console;
s->echo = echo;
}
@@ -1998,12 +2005,11 @@ static const GraphicHwOps text_console_ops = {
static void text_console_do_init(CharDriverState *chr, DisplayState *ds)
{
- QemuConsole *s;
+ VCDriverState *drv = (VCDriverState *)chr;
+ QemuConsole *s = drv->console;
int g_width = 80 * FONT_WIDTH;
int g_height = 24 * FONT_HEIGHT;
- s = chr->opaque;
-
s->out_fifo.buf = s->out_fifo_buf;
s->out_fifo.buf_size = sizeof(s->out_fifo_buf);
s->kbd_timer = timer_new_ms(QEMU_CLOCK_REALTIME, kbd_send_chars, s);
@@ -2056,6 +2062,7 @@ static CharDriverState *text_console_init(ChardevVC *vc, Error **errp)
{
ChardevCommon *common = qapi_ChardevVC_base(vc);
CharDriverState *chr;
+ VCDriverState *drv;
QemuConsole *s;
unsigned width = 0;
unsigned height = 0;
@@ -2092,7 +2099,8 @@ static CharDriverState *text_console_init(ChardevVC *vc, Error **errp)
}
s->chr = chr;
- chr->opaque = s;
+ drv = (VCDriverState *)chr;
+ drv->console = s;
if (display_state) {
text_console_do_init(chr, display_state);
@@ -2196,6 +2204,7 @@ static const TypeInfo qemu_console_info = {
};
static const CharDriver vc_driver = {
+ .instance_size = sizeof(VCDriverState),
.kind = CHARDEV_BACKEND_KIND_VC,
.parse = qemu_chr_parse_vc,
.create = vc_init,