From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed, 30 Aug 2023 09:38:08 +0000 (+0400)
Subject: ui/vc: use common text console surface creation
X-Git-Tag: v8.2.0-rc0~142^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=742a6896ea1b83894e68b2dc455b63cea498bafc;p=thirdparty%2Fqemu.git

ui/vc: use common text console surface creation

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230830093843.3531473-35-marcandre.lureau@redhat.com>
---

diff --git a/ui/console.c b/ui/console.c
index a3fd1c5059d..3d884956b78 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2569,18 +2569,13 @@ static void vc_chr_open(Chardev *chr,
         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;
-        QEMU_CONSOLE(s)->surface = qemu_create_displaysurface(width, height);
     }
 
+    dpy_gfx_replace_surface(QEMU_CONSOLE(s), qemu_create_displaysurface(width, height));
+
     s->chr = chr;
     drv->console = s;
 
-    if (QEMU_CONSOLE(s)->scanout.kind != SCANOUT_SURFACE) {
-        QEMU_CONSOLE(s)->surface = qemu_create_displaysurface(width, height);
-        QEMU_CONSOLE(s)->scanout.kind = SCANOUT_SURFACE;
-    }
-
     /* set current text attributes to default */
     drv->t_attrib = TEXT_ATTRIBUTES_DEFAULT;
     text_console_resize(s);