diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-08-30 13:38:07 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-09-04 14:00:31 +0400 |
| commit | 6ce7b1fa8844db668f0a3c0b37b78b08d331a16a (patch) | |
| tree | 89c8490955112a1328e21f6aa3741ce43b4f7623 /ui/console.c | |
| parent | 5e5a30b7d17f207a85af167ba3efdeff2b1f61de (diff) | |
| download | focaccia-qemu-6ce7b1fa8844db668f0a3c0b37b78b08d331a16a.tar.gz focaccia-qemu-6ce7b1fa8844db668f0a3c0b37b78b08d331a16a.zip | |
ui/console: remove need for g_width/g_height
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20230830093843.3531473-34-marcandre.lureau@redhat.com>
Diffstat (limited to 'ui/console.c')
| -rw-r--r-- | ui/console.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ui/console.c b/ui/console.c index 70e11f924d..a3fd1c5059 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2549,8 +2549,6 @@ static void vc_chr_open(Chardev *chr, QemuTextConsole *s; unsigned width = 0; unsigned height = 0; - int g_width = 80 * FONT_WIDTH; - int g_height = 24 * FONT_HEIGHT; if (vc->has_width) { width = vc->width; @@ -2567,6 +2565,8 @@ static void vc_chr_open(Chardev *chr, trace_console_txt_new(width, height); if (width == 0 || height == 0) { s = QEMU_TEXT_CONSOLE(object_new(TYPE_QEMU_TEXT_CONSOLE)); + width = qemu_console_get_width(NULL, 80 * FONT_WIDTH); + height = qemu_console_get_height(NULL, 24 * FONT_HEIGHT); } else { s = QEMU_TEXT_CONSOLE(object_new(TYPE_QEMU_FIXED_TEXT_CONSOLE)); QEMU_CONSOLE(s)->scanout.kind = SCANOUT_SURFACE; @@ -2577,9 +2577,7 @@ static void vc_chr_open(Chardev *chr, drv->console = s; if (QEMU_CONSOLE(s)->scanout.kind != SCANOUT_SURFACE) { - g_width = qemu_console_get_width(NULL, g_width); - g_height = qemu_console_get_height(NULL, g_height); - QEMU_CONSOLE(s)->surface = qemu_create_displaysurface(g_width, g_height); + QEMU_CONSOLE(s)->surface = qemu_create_displaysurface(width, height); QEMU_CONSOLE(s)->scanout.kind = SCANOUT_SURFACE; } |