From: Marc-André Lureau Date: Wed, 30 Aug 2023 09:38:06 +0000 (+0400) Subject: ui/console: simplify getting active_console size X-Git-Tag: v8.2.0-rc0~142^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e5a30b7d17f207a85af167ba3efdeff2b1f61de;p=thirdparty%2Fqemu.git ui/console: simplify getting active_console size We can get the active console dimension regardless of its kind, by simply giving NULL as argument. It will fallback with the given value when the dimensions aren't known. This will also allow to move the code in a separate unit more easily. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230830093843.3531473-33-marcandre.lureau@redhat.com> --- diff --git a/ui/console.c b/ui/console.c index 5d521ba79d3..70e11f924d8 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2577,10 +2577,8 @@ static void vc_chr_open(Chardev *chr, drv->console = s; if (QEMU_CONSOLE(s)->scanout.kind != SCANOUT_SURFACE) { - if (active_console && active_console->scanout.kind == SCANOUT_SURFACE) { - g_width = qemu_console_get_width(active_console, g_width); - g_height = qemu_console_get_height(active_console, g_height); - } + 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)->scanout.kind = SCANOUT_SURFACE; }