yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

ui/gtk: fix UI info precondition

Browse Source 
dpy_get_ui_info() shouldn't be called if the underlying GPU doesn't
support it.

Before the assert() was added and the regression introduced, GTK code
used to get "zero" UI info, for ex with a simple VGA device. The assert
was added to prevent from calling when there are no console too. The
other display backend that calls dpy_get_ui_info() correctly checks that
pre-condition.

Calling dpy_set_ui_info() is "safe" in this case, it will simply return
an error that can be generally ignored.

Fixes: commit a92e7bb4c ("ui: add precondition for dpy_get_ui_info()")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2023-09-15 15:28:31 +04:00
parent 75b773d84c
commit 9bd4d3df63
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/gtk.c
View File

@ -726,6 +726,10 @@ static void gd_set_ui_refresh_rate(VirtualConsole *vc, int refresh_rate)
{ {
QemuUIInfo info; QemuUIInfo info;
if (!dpy_ui_info_supported(vc->gfx.dcl.con)) {
return;
}
info = *dpy_get_ui_info(vc->gfx.dcl.con); info = *dpy_get_ui_info(vc->gfx.dcl.con);
info.refresh_rate = refresh_rate; info.refresh_rate = refresh_rate;
dpy_set_ui_info(vc->gfx.dcl.con, &info, true); dpy_set_ui_info(vc->gfx.dcl.con, &info, true);
@ -735,6 +739,10 @@ static void gd_set_ui_size(VirtualConsole *vc, gint width, gint height)
{ {
QemuUIInfo info; QemuUIInfo info;
if (!dpy_ui_info_supported(vc->gfx.dcl.con)) {
return;
}
info = *dpy_get_ui_info(vc->gfx.dcl.con); info = *dpy_get_ui_info(vc->gfx.dcl.con);
info.width = width; info.width = width;
info.height = height; info.height = height;