[PATCH] ui: fix dpy_ui_info_supported(con) assertion

Paolo Bonzini posted 1 patch 7 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231002095344.64509-1-pbonzini@redhat.com
Maintainers: Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>
There is a newer version of this series
ui/console.c |  4 +++-
ui/gtk.c     | 20 ++++++++++++++++----
2 files changed, 19 insertions(+), 5 deletions(-)
[PATCH] ui: fix dpy_ui_info_supported(con) assertion
Posted by Paolo Bonzini 7 months ago
VGA does not support getting the physical video size or refresh rate.
This is causing an assertion failure when the GTK+ user interface
calls dpy_get_ui_info().  Return NULL from dpy_get_ui_info() if the
information is not supported, and just ignore the request to set
refresh rate or size in that case.

While the assertion failure was introduced by commit a92e7bb4cad
("ui: add precondition for dpy_get_ui_info()", 2023-09-12), QEMU had
been using con->ui_info incorrectly since before.

Fixes: a92e7bb4cad ("ui: add precondition for dpy_get_ui_info()", 2023-09-12)
Fixes: aeffd071ed8 ("ui: Deliver refresh rate via QemuUIInfo", 2022-06-14)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 ui/console.c |  4 +++-
 ui/gtk.c     | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ui/console.c b/ui/console.c
index 4a4f19ed33e..24438b187c8 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -815,7 +815,9 @@ bool dpy_ui_info_supported(const QemuConsole *con)
 
 const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con)
 {
-    assert(dpy_ui_info_supported(con));
+    if (!dpy_ui_info_supported(con)) {
+        return NULL;
+    }
 
     if (con == NULL) {
         con = active_console;
diff --git a/ui/gtk.c b/ui/gtk.c
index e09f97a86b7..d8abdb1bdcc 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -724,18 +724,30 @@ static gboolean gd_window_close(GtkWidget *widget, GdkEvent *event,
 
 static void gd_set_ui_refresh_rate(VirtualConsole *vc, int refresh_rate)
 {
-    QemuUIInfo info;
+    QemuUIInfo *p_info, info;
 
-    info = *dpy_get_ui_info(vc->gfx.dcl.con);
+    p_info = dpy_get_ui_info(vc->gfx.dcl.con);
+    if (!p_info) {
+        /* not supported by guest */
+        return;
+    }
+
+    info = *p_info;
     info.refresh_rate = refresh_rate;
     dpy_set_ui_info(vc->gfx.dcl.con, &info, true);
 }
 
 static void gd_set_ui_size(VirtualConsole *vc, gint width, gint height)
 {
-    QemuUIInfo info;
+    QemuUIInfo *p_info, info;
 
-    info = *dpy_get_ui_info(vc->gfx.dcl.con);
+    p_info = dpy_get_ui_info(vc->gfx.dcl.con);
+    if (!p_info) {
+        /* not supported by guest */
+        return;
+    }
+
+    info = *p_info;
     info.width = width;
     info.height = height;
     dpy_set_ui_info(vc->gfx.dcl.con, &info, true);
-- 
2.41.0