[PULL 0/5] Ui patches

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit af9264da80073435fd78944bc5a46e695897d7e5:

  Merge tag '20231119-xtensa-1' of https://github.com/OSLL/qemu-xtensa into staging (2023-11-20 05:25:19 -0500)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to e0c58720bfd8c0553f170b64717278b07438d2f5:

  ui/pixman-minimal.h: fix empty allocation (2023-11-21 14:38:14 +0400)

----------------------------------------------------------------
UI: fixes for 8.2-rc1

----------------------------------------------------------------

Manos Pitsidianakis (1):
  ui/pixman-minimal.h: fix empty allocation

Marc-André Lureau (4):
  vl: revert behaviour for -display none
  ui: use "vc" chardev for dbus, gtk & spice-app
  ui/console: fix default VC when there are no display
  vl: add missing display_remote++

 include/ui/pixman-minimal.h | 48 +++++++++++++++++++++++++++++++++++--
 system/vl.c                 |  4 +++-
 ui/console.c                | 18 +++++++-------
 ui/dbus.c                   |  1 +
 ui/gtk.c                    |  1 +
 ui/spice-app.c              |  1 +
 6 files changed, 60 insertions(+), 13 deletions(-)

-- 
2.42.0

[PULL 1/5] vl: revert behaviour for -display none

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Commit 1bec1cc0d ("ui/console: allow to override the default VC") changed
the behaviour of the "-display none" option, so that it now creates a
QEMU monitor on the terminal. "-display none" should not be tangled up
with whether we create a monitor or a serial terminal; it should purely
and only disable the graphical window. Changing its behaviour like this
breaks command lines which, for example, use semihosting for their
output and don't want a graphical window, as they now get a monitor they
never asked for.

It also breaks the command line we document for Xen in
docs/system/i386/xen.html:

 $ ./qemu-system-x86_64 --accel kvm,xen-version=0x40011,kernel-irqchip=split \
    -display none -chardev stdio,mux=on,id=char0,signal=off -mon char0 \
    -device xen-console,chardev=char0  -drive file=${GUEST_IMAGE},if=xen

qemu-system-x86_64: cannot use stdio by multiple character devices
qemu-system-x86_64: could not connect serial device to character backend
'stdio'

When qemu is compiled without PIXMAN, by default the serials aren't
muxed with the monitor anymore on stdio. The serials are redirected to
"null" instead, and the monitor isn't set up.

Fixes: commit 1bec1cc0d ("ui/console: allow to override the default VC")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
---
 system/vl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/vl.c b/system/vl.c
index 5af7ced2a1..14bf0cf0bf 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -1391,7 +1391,7 @@ static void qemu_create_default_devices(void)
         }
     }
 
-    if (nographic || (!vc && !is_daemonized() && isatty(STDOUT_FILENO))) {
+    if (nographic) {
         if (default_parallel) {
             add_device_config(DEV_PARALLEL, "null");
         }
-- 
2.42.0

[PULL 2/5] ui: use "vc" chardev for dbus, gtk & spice-app

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Those display have their own implementation of "vc" chardev, which
doesn't use pixman. They also don't implement the width/height/cols/rows
options, so qemu_display_get_vc() should return a compatible argument.

This patch was meant to be with the pixman series, when the "vc" field
was introduced. It fixes a regression where VC are created on the
tty (or null) instead of the display own "vc" implementation.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
---
 ui/dbus.c      | 1 +
 ui/gtk.c       | 1 +
 ui/spice-app.c | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ui/dbus.c b/ui/dbus.c
index 866467ad2e..e08b5de064 100644
--- a/ui/dbus.c
+++ b/ui/dbus.c
@@ -518,6 +518,7 @@ static QemuDisplay qemu_display_dbus = {
     .type       = DISPLAY_TYPE_DBUS,
     .early_init = early_dbus_init,
     .init       = dbus_init,
+    .vc         = "vc",
 };
 
 static void register_dbus(void)
diff --git a/ui/gtk.c b/ui/gtk.c
index be047a41ad..810d7fc796 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2534,6 +2534,7 @@ static QemuDisplay qemu_display_gtk = {
     .type       = DISPLAY_TYPE_GTK,
     .early_init = early_gtk_display_init,
     .init       = gtk_display_init,
+    .vc         = "vc",
 };
 
 static void register_gtk(void)
diff --git a/ui/spice-app.c b/ui/spice-app.c
index 405fb7f9f5..a10b4a58fe 100644
--- a/ui/spice-app.c
+++ b/ui/spice-app.c
@@ -220,6 +220,7 @@ static QemuDisplay qemu_display_spice_app = {
     .type       = DISPLAY_TYPE_SPICE_APP,
     .early_init = spice_app_display_early_init,
     .init       = spice_app_display_init,
+    .vc         = "vc",
 };
 
 static void register_spice_app(void)
-- 
2.42.0

[PULL 3/5] ui/console: fix default VC when there are no display

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

When display is "none", we may still have remote displays (I think it
would be simpler if VNC/Spice were regular display btw). Return the
default VC then, and set them up to fix a regression when using remote
display and it used the TTY instead.

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1989
Fixes: commit 1bec1cc0d ("ui/console: allow to override the default VC")
Reported-by: German Maglione <gmaglione@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
---
 ui/console.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/ui/console.c b/ui/console.c
index 8e688d3569..7db921e3b7 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1679,19 +1679,17 @@ void qemu_display_init(DisplayState *ds, DisplayOptions *opts)
 
 const char *qemu_display_get_vc(DisplayOptions *opts)
 {
-    assert(opts->type < DISPLAY_TYPE__MAX);
-    if (opts->type == DISPLAY_TYPE_NONE) {
-        return NULL;
-    }
-    assert(dpys[opts->type] != NULL);
-    if (dpys[opts->type]->vc) {
-        return dpys[opts->type]->vc;
-    } else {
 #ifdef CONFIG_PIXMAN
-        return "vc:80Cx24C";
+    const char *vc = "vc:80Cx24C";
+#else
+    const char *vc = NULL;
 #endif
+
+    assert(opts->type < DISPLAY_TYPE__MAX);
+    if (dpys[opts->type] && dpys[opts->type]->vc) {
+        vc = dpys[opts->type]->vc;
     }
-    return NULL;
+    return vc;
 }
 
 void qemu_display_help(void)
-- 
2.42.0

[PULL 4/5] vl: add missing display_remote++

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

We should also consider -display vnc= as setting up a remote display,
and not attempt to add another default one.

The display_remote++ in qemu_setup_display() isn't necessary at this
point, but is there for completeness and further usages of the variable.

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1988
Fixes: commit 484629fc81 ("vl: simplify display_remote logic ")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 system/vl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/vl.c b/system/vl.c
index 14bf0cf0bf..da2654aa77 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -1110,6 +1110,7 @@ static void parse_display(const char *p)
          */
         if (*opts == '=') {
             vnc_parse(opts + 1);
+            display_remote++;
         } else {
             error_report("VNC requires a display argument vnc=<display>");
             exit(1);
@@ -1359,6 +1360,7 @@ static void qemu_setup_display(void)
             dpy.type = DISPLAY_TYPE_NONE;
 #if defined(CONFIG_VNC)
             vnc_parse("localhost:0,to=99,id=default");
+            display_remote++;
 #endif
         }
     }
-- 
2.42.0

[PULL 5/5] ui/pixman-minimal.h: fix empty allocation

[marcandre.lureau]

From: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

In the minimal pixman API stub that is used when the real pixman
dependency is missing a NULL dereference happens when
virtio-gpu-rutabaga allocates a pixman image with bits = NULL and
rowstride_bytes = zero. A buffer of rowstride_bytes * height is
allocated which is NULL. However, in that scenario pixman calculates a
new stride value based on given width, height and format size.

This commit adds a helper function that performs the same logic as
pixman.

Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20231121093840.2121195-1-manos.pitsidianakis@linaro.org>
---
 include/ui/pixman-minimal.h | 48 +++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/include/ui/pixman-minimal.h b/include/ui/pixman-minimal.h
index efcf570c9e..6dd7de1c7e 100644
--- a/include/ui/pixman-minimal.h
+++ b/include/ui/pixman-minimal.h
@@ -113,6 +113,45 @@ typedef struct pixman_color {
     uint16_t    alpha;
 } pixman_color_t;
 
+static inline uint32_t *create_bits(pixman_format_code_t format,
+                                    int width,
+                                    int height,
+                                    int *rowstride_bytes)
+{
+    int stride = 0;
+    size_t buf_size = 0;
+    int bpp = PIXMAN_FORMAT_BPP(format);
+
+    /*
+     * Calculate the following while checking for overflow truncation:
+     * stride = ((width * bpp + 0x1f) >> 5) * sizeof(uint32_t);
+     */
+
+    if (unlikely(__builtin_mul_overflow(width, bpp, &stride))) {
+        return NULL;
+    }
+
+    if (unlikely(__builtin_add_overflow(stride, 0x1f, &stride))) {
+        return NULL;
+    }
+
+    stride >>= 5;
+
+    stride *= sizeof(uint32_t);
+
+    if (unlikely(__builtin_mul_overflow((size_t) height,
+                                        (size_t) stride,
+                                        &buf_size))) {
+        return NULL;
+    }
+
+    if (rowstride_bytes) {
+        *rowstride_bytes = stride;
+    }
+
+    return g_malloc0(buf_size);
+}
+
 static inline pixman_image_t *pixman_image_create_bits(pixman_format_code_t format,
                                                        int width,
                                                        int height,
@@ -123,13 +162,18 @@ static inline pixman_image_t *pixman_image_create_bits(pixman_format_code_t form
 
     i->width = width;
     i->height = height;
-    i->stride = rowstride_bytes ?: width * DIV_ROUND_UP(PIXMAN_FORMAT_BPP(format), 8);
     i->format = format;
     if (bits) {
         i->data = bits;
     } else {
-        i->free_me = i->data = g_malloc0(rowstride_bytes * height);
+        i->free_me = i->data =
+            create_bits(format, width, height, &rowstride_bytes);
+        if (width && height) {
+            assert(i->data);
+        }
     }
+    i->stride = rowstride_bytes ? rowstride_bytes :
+                            width * DIV_ROUND_UP(PIXMAN_FORMAT_BPP(format), 8);
     i->ref_count = 1;
 
     return i;
-- 
2.42.0

Re: [PULL 0/5] Ui patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit 9b16edec6e9a483469c789475b2065d26b52db35:

  Merge tag 'pull-ppc-for-20250928-20250929' of https://gitlab.com/harshpb/qemu into staging (2025-09-29 07:25:28 -0700)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to 9163424c50981dbc4ded9990228ac01a3b193656:

  ui/icons/qemu.svg: Add metadata information (author, license) to the logo (2025-09-30 11:21:55 +0400)

----------------------------------------------------------------
UI-related

Fixes for gtk, sdl2, spice UI backends.

----------------------------------------------------------------

Marc-André Lureau (1):
  ui/spice: fix crash when disabling GL scanout on

Mohamed Akram (1):
  ui/spice: Fix abort on macOS

Nir Lichtman (1):
  ui/sdl2: fix reset scaling binding to be consistent with gtk

Thomas Huth (1):
  ui/icons/qemu.svg: Add metadata information (author, license) to the
    logo

Weifeng Liu (1):
  gtk: Skip drawing if console surface is NULL

 ui/gtk-egl.c       |  5 +----
 ui/gtk-gl-area.c   |  5 +----
 ui/sdl2.c          |  2 +-
 ui/spice-core.c    |  6 +-----
 ui/spice-display.c |  4 +++-
 ui/icons/qemu.svg  | 21 ++++++++++++++++++++-
 6 files changed, 27 insertions(+), 16 deletions(-)

-- 
2.51.0

Re: [PULL 0/5] Ui patches

[Richard Henderson]

On 9/30/25 00:55, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
> 
> The following changes since commit 9b16edec6e9a483469c789475b2065d26b52db35:
> 
>    Merge tag 'pull-ppc-for-20250928-20250929' ofhttps://gitlab.com/harshpb/qemu into staging (2025-09-29 07:25:28 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request
> 
> for you to fetch changes up to 9163424c50981dbc4ded9990228ac01a3b193656:
> 
>    ui/icons/qemu.svg: Add metadata information (author, license) to the logo (2025-09-30 11:21:55 +0400)
> 
> ----------------------------------------------------------------
> UI-related
> 
> Fixes for gtk, sdl2, spice UI backends.


Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/10.2 as appropriate.

r~

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit c62d54d0a8067ffb3d5b909276f7296d7df33fa7:

  Update version for v9.0.0-rc0 release (2024-03-19 19:13:52 +0000)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to d4069a84a3380247c1b524096c6a807743bf687a:

  ui: compile dbus-display1.c with -fPIC as necessary (2024-03-20 10:28:00 +0400)

----------------------------------------------------------------
UI: fixes

- dbus-display shared-library compilation fix
- remove console_select() and fix related issues

----------------------------------------------------------------

Akihiko Odaki (4):
  ui/vc: Do not inherit the size of active console
  ui/vnc: Do not use console_select()
  ui/cocoa: Do not use console_select()
  ui/curses: Do not use console_select()

Marc-André Lureau (1):
  ui: compile dbus-display1.c with -fPIC as necessary

 include/ui/console.h   |   2 +-
 include/ui/kbd-state.h |  11 ++++
 ui/console-priv.h      |   2 +-
 ui/console-vc-stubs.c  |   2 +-
 ui/console-vc.c        |   7 +--
 ui/console.c           | 133 ++++++++++-------------------------------
 ui/curses.c            |  48 ++++++++-------
 ui/kbd-state.c         |   6 ++
 ui/vnc.c               |  14 +++--
 ui/cocoa.m             |  37 ++++++++----
 ui/meson.build         |   3 +-
 11 files changed, 119 insertions(+), 146 deletions(-)

-- 
2.44.0

Re: [PULL 0/5] Ui patches

[Peter Maydell]

On Wed, 20 Mar 2024 at 13:54, <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The following changes since commit c62d54d0a8067ffb3d5b909276f7296d7df33fa7:
>
>   Update version for v9.0.0-rc0 release (2024-03-19 19:13:52 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request
>
> for you to fetch changes up to d4069a84a3380247c1b524096c6a807743bf687a:
>
>   ui: compile dbus-display1.c with -fPIC as necessary (2024-03-20 10:28:00 +0400)
>
> ----------------------------------------------------------------
> UI: fixes
>
> - dbus-display shared-library compilation fix
> - remove console_select() and fix related issues
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM

[PULL 0/5] UI patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit 8f3f329f5e0117bd1a23a79ab751f8a7d3471e4b:

  Merge tag 'migration-20240311-pull-request' of https://gitlab.com/peterx/qemu into staging (2024-03-12 11:35:41 +0000)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to dfcf74fa68c88233209aafc5f82728d0b9a1af5c:

  virtio-gpu: fix scanout migration post-load (2024-03-12 17:57:58 +0400)

----------------------------------------------------------------
display/ui: pending fixes

- ui/vnc: Respect bound console
- ui/dbus: optimize a bit message queuing
- virtio-gpu: fix blob scanout post-load

----------------------------------------------------------------

Akihiko Odaki (1):
  ui/vnc: Respect bound console

Marc-André Lureau (4):
  ui/dbus: factor out sending a scanout
  ui/dbus: filter out pending messages when scanout
  virtio-gpu: remove needless condition
  virtio-gpu: fix scanout migration post-load

 include/hw/virtio/virtio-gpu.h |  1 +
 hw/display/virtio-gpu.c        | 58 ++++++++++++++++++--------
 ui/dbus-listener.c             | 75 ++++++++++++++++++++++++++--------
 ui/vnc.c                       | 59 +++++++++++++-------------
 ui/trace-events                |  1 +
 5 files changed, 130 insertions(+), 64 deletions(-)

-- 
2.44.0

Re: [PULL 0/5] UI patches

[Peter Maydell]

On Tue, 12 Mar 2024 at 14:02, <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The following changes since commit 8f3f329f5e0117bd1a23a79ab751f8a7d3471e4b:
>
>   Merge tag 'migration-20240311-pull-request' of https://gitlab.com/peterx/qemu into staging (2024-03-12 11:35:41 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request
>
> for you to fetch changes up to dfcf74fa68c88233209aafc5f82728d0b9a1af5c:
>
>   virtio-gpu: fix scanout migration post-load (2024-03-12 17:57:58 +0400)
>
> ----------------------------------------------------------------
> display/ui: pending fixes
>
> - ui/vnc: Respect bound console
> - ui/dbus: optimize a bit message queuing
> - virtio-gpu: fix blob scanout post-load
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit 8aba939e77daca10eac99d9d467f65ba7df5ab3e:

  Merge tag 'pull-riscv-to-apply-20231107' of https://github.com/alistair23/qemu into staging (2023-11-07 11:08:16 +0800)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to fb93569e422d4f4b5953dd953c92ba7838309972:

  ui: Replacing pointer in function (2023-11-07 11:45:48 +0400)

----------------------------------------------------------------
UI patch queue

----------------------------------------------------------------

Antonio Caggiano (1):
  ui/gtk-egl: Check EGLSurface before doing scanout

Carwyn Ellis (1):
  ui/cocoa: add zoom-to-fit display option

Dongwon Kim (1):
  ui/gtk-egl: apply scale factor when calculating window's dimension

Marc-André Lureau (1):
  ui/gtk: force realization of drawing area

Sergey Mironov (1):
  ui: Replacing pointer in function

 qapi/ui.json |  7 ++++++-
 ui/gtk-egl.c | 31 ++++++++++++++++++++-----------
 ui/gtk.c     | 12 +++++++++++-
 ui/cocoa.m   | 32 ++++++++++++++++++--------------
 4 files changed, 55 insertions(+), 27 deletions(-)

-- 
2.41.0

Re: [PULL 0/5] Ui patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 0/5] Ui patches

[Michael Tokarev]

07.11.2023 12:30, marcandre.lureau@redhat.com:
...
> Antonio Caggiano (1):
>    ui/gtk-egl: Check EGLSurface before doing scanout
> 
> Carwyn Ellis (1):
>    ui/cocoa: add zoom-to-fit display option
> 
> Dongwon Kim (1):
>    ui/gtk-egl: apply scale factor when calculating window's dimension
> 
> Marc-André Lureau (1):
>    ui/gtk: force realization of drawing area
> 
> Sergey Mironov (1):
>    ui: Replacing pointer in function

Which changes are worth picking up for qemu-stable?

I'm definitely picking up "ui/gtk: force realization of drawing area"
which fixes a real bug.  "ui/gtk-egl: Check EGLSurface before doing scanout"
and "ui/gtk-egl: apply scale factor when calculating window's dimension"
smells like valid candidates too, maybe "ui: Replacing pointer in function"
as well?

(Adding patch authors to the Cc list)

Thanks,

/mjt