From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@redhat.com
Subject: [PATCH] ui: fix dpy_ui_info_supported(con) assertion
Date: Mon, 2 Oct 2023 11:53:44 +0200 [thread overview]
Message-ID: <20231002095344.64509-1-pbonzini@redhat.com> (raw)
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
reply other threads:[~2023-10-02 9:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231002095344.64509-1-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).