Re: [PATCH v2] ui: fix dpy_ui_info_supported(con) assertion

[Marc-André Lureau]

Hi

On Mon, Oct 2, 2023 at 1:54 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> 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>

Did you see my patch ?
https://lore.kernel.org/qemu-devel/20230915113637.2127644-1-marcandre.lureau@redhat.com/

I think I prefer mine :)

> ---
>  ui/console.c |  4 +++-
>  ui/gtk.c     | 18 ++++++++++++++++--
>  2 files changed, 19 insertions(+), 3 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..0b5e314cf0d 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -724,18 +724,32 @@ static gboolean gd_window_close(GtkWidget *widget, 
> GdkEvent *event,
>
>  static void gd_set_ui_refresh_rate(VirtualConsole *vc, int refresh_rate)
>  {
> +    const QemuUIInfo *p_info;
>      QemuUIInfo 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)
>  {
> +    const QemuUIInfo *p_info;
>      QemuUIInfo 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
>