[PATCH 0/4] ui: fix small leaks in -display dbus

[PATCH 0/4] ui: fix small leaks in -display dbus

[marcandre.lureau]

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



Marc-André Lureau (4):
  tests: fix leaks in dbus-display-test
  ui/dbus: fix leak regression
  ui/dbus: fix Unix.Map proxy leak
  ui/dbus: fix pixman cleanup

 tests/qtest/dbus-display-test.c |  9 +++++++++
 ui/dbus-listener.c              | 11 +++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

-- 
2.52.0

[PATCH 1/4] tests: fix leaks in dbus-display-test

[marcandre.lureau]

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

Close the connections and complete the method invocations.

Thanks ASAN for the report.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/qtest/dbus-display-test.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c
index 1d5951b7117..5773776cad5 100644
--- a/tests/qtest/dbus-display-test.c
+++ b/tests/qtest/dbus-display-test.c
@@ -76,6 +76,7 @@ test_dbus_display_vm(void)
         qemu_dbus_display1_vm_get_name(QEMU_DBUS_DISPLAY1_VM(vm)),
         ==,
         "dbus-test");
+    g_clear_object(&conn);
     qtest_quit(qts);
 }
 
@@ -97,6 +98,8 @@ static gboolean listener_handle_scanout(
     GVariant *arg_data,
     TestDBusConsoleRegister *test)
 {
+    qemu_dbus_display1_listener_complete_scanout(object, invocation);
+
     if (!test->with_map) {
         g_main_loop_quit(test->loop);
     }
@@ -131,6 +134,9 @@ static gboolean listener_handle_scanout_map(
     g_assert_no_errno(addr == MAP_FAILED ? -1 : 0);
     g_assert_no_errno(munmap(addr, len));
 
+    qemu_dbus_display1_listener_unix_map_complete_scanout_map(object, invocation,
+                                                              NULL);
+
     g_main_loop_quit(test->loop);
 
     close(fd);
@@ -287,6 +293,7 @@ test_dbus_display_console(const void* data)
 
     g_clear_object(&test.server);
     g_clear_object(&test.listener_conn);
+    g_clear_object(&conn);
     qtest_quit(qts);
 }
 
@@ -322,6 +329,7 @@ test_dbus_display_keyboard(void)
         &err);
     if (g_error_matches(err, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
         g_test_skip("The VM doesn't have a console!");
+        g_clear_object(&conn);
         qtest_quit(qts);
         return;
     }
@@ -348,6 +356,7 @@ test_dbus_display_keyboard(void)
     g_assert_cmpint(qemu_dbus_display1_keyboard_get_modifiers(
                         QEMU_DBUS_DISPLAY1_KEYBOARD(keyboard)), ==, 0);
 
+    g_clear_object(&conn);
     qtest_quit(qts);
 }
 
-- 
2.52.0

Re: [PATCH 1/4] tests: fix leaks in dbus-display-test

[Fabiano Rosas]

marcandre.lureau@redhat.com writes:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Close the connections and complete the method invocations.
>
> Thanks ASAN for the report.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  tests/qtest/dbus-display-test.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c
> index 1d5951b7117..5773776cad5 100644
> --- a/tests/qtest/dbus-display-test.c
> +++ b/tests/qtest/dbus-display-test.c
> @@ -76,6 +76,7 @@ test_dbus_display_vm(void)
>          qemu_dbus_display1_vm_get_name(QEMU_DBUS_DISPLAY1_VM(vm)),
>          ==,
>          "dbus-test");
> +    g_clear_object(&conn);
>      qtest_quit(qts);
>  }
>  
> @@ -97,6 +98,8 @@ static gboolean listener_handle_scanout(
>      GVariant *arg_data,
>      TestDBusConsoleRegister *test)
>  {
> +    qemu_dbus_display1_listener_complete_scanout(object, invocation);
> +
>      if (!test->with_map) {
>          g_main_loop_quit(test->loop);
>      }
> @@ -131,6 +134,9 @@ static gboolean listener_handle_scanout_map(
>      g_assert_no_errno(addr == MAP_FAILED ? -1 : 0);
>      g_assert_no_errno(munmap(addr, len));
>  
> +    qemu_dbus_display1_listener_unix_map_complete_scanout_map(object, invocation,
> +                                                              NULL);
> +
>      g_main_loop_quit(test->loop);
>  
>      close(fd);
> @@ -287,6 +293,7 @@ test_dbus_display_console(const void* data)
>  
>      g_clear_object(&test.server);
>      g_clear_object(&test.listener_conn);
> +    g_clear_object(&conn);
>      qtest_quit(qts);
>  }
>  
> @@ -322,6 +329,7 @@ test_dbus_display_keyboard(void)
>          &err);
>      if (g_error_matches(err, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
>          g_test_skip("The VM doesn't have a console!");
> +        g_clear_object(&conn);
>          qtest_quit(qts);
>          return;
>      }
> @@ -348,6 +356,7 @@ test_dbus_display_keyboard(void)
>      g_assert_cmpint(qemu_dbus_display1_keyboard_get_modifiers(
>                          QEMU_DBUS_DISPLAY1_KEYBOARD(keyboard)), ==, 0);
>  
> +    g_clear_object(&conn);
>      qtest_quit(qts);
>  }

Acked-by: Fabiano Rosas <farosas@suse.de>

[PATCH 2/4] ui/dbus: fix leak regression

[marcandre.lureau]

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

For some reason, during refactoring, an extra reference leak was introduced.

Fixes: commit 7945576cf2 ("ui/dbus: factor out sending a scanout")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 ui/dbus-listener.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 52e041edb0f..407719fc1e0 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -815,8 +815,7 @@ static void ddl_scanout(DBusDisplayListener *ddl)
     qemu_dbus_display1_listener_call_scanout(
         ddl->proxy, surface_width(ddl->ds), surface_height(ddl->ds),
         surface_stride(ddl->ds), surface_format(ddl->ds), v_data,
-        G_DBUS_CALL_FLAGS_NONE, DBUS_DEFAULT_TIMEOUT, NULL, NULL,
-        g_object_ref(ddl));
+        G_DBUS_CALL_FLAGS_NONE, DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL);
 }
 
 static void dbus_gfx_update(DisplayChangeListener *dcl,
-- 
2.52.0

Re: [PATCH 2/4] ui/dbus: fix leak regression

[Philippe Mathieu-Daudé]

On 22/1/26 12:31, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> For some reason, during refactoring, an extra reference leak was introduced.
> 
> Fixes: commit 7945576cf2 ("ui/dbus: factor out sending a scanout")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   ui/dbus-listener.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 3/4] ui/dbus: fix Unix.Map proxy leak

[marcandre.lureau]

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

Fixes: commit 48b7ef0f0 ("ui/dbus: implement Unix.Map")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 ui/dbus-listener.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 407719fc1e0..46264839d86 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -960,8 +960,8 @@ dbus_display_listener_dispose(GObject *object)
     g_clear_object(&ddl->conn);
     g_clear_pointer(&ddl->bus_name, g_free);
     g_clear_object(&ddl->proxy);
-#ifdef WIN32
     g_clear_object(&ddl->map_proxy);
+#ifdef WIN32
     g_clear_object(&ddl->d3d11_proxy);
     g_clear_pointer(&ddl->peer_process, CloseHandle);
 #ifdef CONFIG_PIXMAN
-- 
2.52.0

Re: [PATCH 3/4] ui/dbus: fix Unix.Map proxy leak

[Peter Maydell]

On Thu, 22 Jan 2026 at 11:33, <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Fixes: commit 48b7ef0f0 ("ui/dbus: implement Unix.Map")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  ui/dbus-listener.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

[PATCH 4/4] ui/dbus: fix pixman cleanup

[marcandre.lureau]

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

Moved pixman_region32_fini() outside the WIN32 block so it's called on
all platforms.

Fixes: commit 7007e98c ("ui/dbus: implement damage regions for GL")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 ui/dbus-listener.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 46264839d86..3e2b4adf41f 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -964,15 +964,15 @@ dbus_display_listener_dispose(GObject *object)
 #ifdef WIN32
     g_clear_object(&ddl->d3d11_proxy);
     g_clear_pointer(&ddl->peer_process, CloseHandle);
-#ifdef CONFIG_PIXMAN
-    pixman_region32_fini(&ddl->gl_damage);
-#endif
 #ifdef CONFIG_OPENGL
     egl_fb_destroy(&ddl->fb);
 #endif
 #else /* !WIN32 */
     g_clear_object(&ddl->scanout_dmabuf_v2_proxy);
 #endif
+#ifdef CONFIG_PIXMAN
+    pixman_region32_fini(&ddl->gl_damage);
+#endif
 
     G_OBJECT_CLASS(dbus_display_listener_parent_class)->dispose(object);
 }
-- 
2.52.0

Re: [PATCH 4/4] ui/dbus: fix pixman cleanup

[Peter Maydell]

On Thu, 22 Jan 2026 at 11:33, <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Moved pixman_region32_fini() outside the WIN32 block so it's called on
> all platforms.
>
> Fixes: commit 7007e98c ("ui/dbus: implement damage regions for GL")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  ui/dbus-listener.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH 0/4] ui: fix small leaks in -display dbus

[Peter Maydell]

On Thu, 22 Jan 2026 at 11:33, <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
>
>
> Marc-André Lureau (4):
>   tests: fix leaks in dbus-display-test
>   ui/dbus: fix leak regression
>   ui/dbus: fix Unix.Map proxy leak
>   ui/dbus: fix pixman cleanup
>
>  tests/qtest/dbus-display-test.c |  9 +++++++++
>  ui/dbus-listener.c              | 11 +++++------
>  2 files changed, 14 insertions(+), 6 deletions(-)

I don't know the code well enough to review more than the
two really obvious ones, but this series fixes all the leaks I
see in the dbus-display-test test.

-- PMM

Re: [PATCH 0/4] ui: fix small leaks in -display dbus

[Philippe Mathieu-Daudé]

On 8/3/26 14:25, Peter Maydell wrote:
> On Thu, 22 Jan 2026 at 11:33, <marcandre.lureau@redhat.com> wrote:
>>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>>
>>
>> Marc-André Lureau (4):
>>    tests: fix leaks in dbus-display-test
>>    ui/dbus: fix leak regression
>>    ui/dbus: fix Unix.Map proxy leak
>>    ui/dbus: fix pixman cleanup
>>
>>   tests/qtest/dbus-display-test.c |  9 +++++++++
>>   ui/dbus-listener.c              | 11 +++++------
>>   2 files changed, 14 insertions(+), 6 deletions(-)
> 
> I don't know the code well enough to review more than the
> two really obvious ones, but this series fixes all the leaks I
> see in the dbus-display-test test.

Is this statement equivalent to:

Tested-by: Peter Maydell <peter.maydell@linaro.org>

?

Re: [PATCH 0/4] ui: fix small leaks in -display dbus

[Peter Maydell]

On Mon, 9 Mar 2026 at 14:21, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 8/3/26 14:25, Peter Maydell wrote:
> > On Thu, 22 Jan 2026 at 11:33, <marcandre.lureau@redhat.com> wrote:
> >>
> >> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >>
> >>
> >>
> >> Marc-André Lureau (4):
> >>    tests: fix leaks in dbus-display-test
> >>    ui/dbus: fix leak regression
> >>    ui/dbus: fix Unix.Map proxy leak
> >>    ui/dbus: fix pixman cleanup
> >>
> >>   tests/qtest/dbus-display-test.c |  9 +++++++++
> >>   ui/dbus-listener.c              | 11 +++++------
> >>   2 files changed, 14 insertions(+), 6 deletions(-)
> >
> > I don't know the code well enough to review more than the
> > two really obvious ones, but this series fixes all the leaks I
> > see in the dbus-display-test test.
>
> Is this statement equivalent to:
>
> Tested-by: Peter Maydell <peter.maydell@linaro.org>

I thought about that, but I decided against it, because
I have not tested the actual dbus functionality at all;
I only ran 'make check'. For all I know the tests could have
fixed the leaks and broken something for users :-)

-- PMM

Re: [PATCH 0/4] ui: fix small leaks in -display dbus

[Philippe Mathieu-Daudé]

On 9/3/26 15:51, Peter Maydell wrote:
> On Mon, 9 Mar 2026 at 14:21, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>> On 8/3/26 14:25, Peter Maydell wrote:


>>>> Marc-André Lureau (4):
>>>>     tests: fix leaks in dbus-display-test
>>>>     ui/dbus: fix leak regression
>>>>     ui/dbus: fix Unix.Map proxy leak
>>>>     ui/dbus: fix pixman cleanup
>>>>
>>>>    tests/qtest/dbus-display-test.c |  9 +++++++++
>>>>    ui/dbus-listener.c              | 11 +++++------
>>>>    2 files changed, 14 insertions(+), 6 deletions(-)
>>>
>>> I don't know the code well enough to review more than the
>>> two really obvious ones, but this series fixes all the leaks I
>>> see in the dbus-display-test test.
>>
>> Is this statement equivalent to:
>>
>> Tested-by: Peter Maydell <peter.maydell@linaro.org>
> 
> I thought about that, but I decided against it, because
> I have not tested the actual dbus functionality at all;
> I only ran 'make check'. For all I know the tests could have
> fixed the leaks and broken something for users :-)

OK. I'll queue this series then, thanks!