From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Akihiko Odaki" <odaki@rsg.ci.i.u-tokyo.ac.jp>
Subject: [PULL 10/13] ui/dbus: Clean up dbus_update_gl_cb() error checking
Date: Tue, 30 Sep 2025 14:46:50 +0200 [thread overview]
Message-ID: <20250930124653.321609-11-armbru@redhat.com> (raw)
In-Reply-To: <20250930124653.321609-1-armbru@redhat.com>
From GLib "Rules for use of GError":
A GError* must be initialized to NULL before passing its address
to a function that can report errors.
dbus_update_gl_cb() seemingly violates this rule: it passes &err to
qemu_dbus_display1_listener_call_update_dmabuf_finish() and to
qemu_dbus_display1_listener_win32_d3d11_call_update_texture2d_finish()
without clearing it in between. Harmless, because the first call is
guarded by #ifdef CONFIG_GBM, the second by #ifdef WIN32, and the two
are mutually exclusive. I think.
Clean this up to be obviously correct.
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20250923091000.3180122-11-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
---
ui/dbus-listener.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 42875b8eed..09d7a319b1 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -221,18 +221,21 @@ static void dbus_update_gl_cb(GObject *source_object,
#ifdef CONFIG_GBM
success = qemu_dbus_display1_listener_call_update_dmabuf_finish(
ddl->proxy, res, &err);
+ if (!success) {
+ error_report("Failed to call update: %s", err->message);
+ }
#endif
#ifdef WIN32
success = qemu_dbus_display1_listener_win32_d3d11_call_update_texture2d_finish(
ddl->d3d11_proxy, res, &err);
- d3d_texture2d_acquire0(ddl->d3d_texture, &error_warn);
-#endif
-
if (!success) {
error_report("Failed to call update: %s", err->message);
}
+ d3d_texture2d_acquire0(ddl->d3d_texture, &error_warn);
+#endif
+
graphic_hw_gl_block(ddl->dcl.con, false);
g_object_unref(ddl);
}
--
2.49.0
next prev parent reply other threads:[~2025-09-30 12:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-30 12:46 [PULL 00/13] Error reporting patches for 2025-09-30 Markus Armbruster
2025-09-30 12:46 ` [PULL 01/13] monitor: Clean up HMP gdbserver error reporting Markus Armbruster
2025-09-30 12:46 ` [PULL 02/13] tcg: Fix error reporting on mprotect() failure in tcg_region_init() Markus Armbruster
2025-09-30 12:46 ` [PULL 03/13] hw/cxl: Convert cxl_fmws_link() to Error Markus Armbruster
2025-09-30 12:46 ` [PULL 04/13] migration/cpr: Clean up error reporting in cpr_resave_fd() Markus Armbruster
2025-09-30 12:46 ` [PULL 05/13] hw/remote/vfio-user: Clean up error reporting Markus Armbruster
2025-09-30 12:46 ` [PULL 06/13] net/slirp: " Markus Armbruster
2025-09-30 12:46 ` [PULL 07/13] ui/spice-core: " Markus Armbruster
2025-09-30 12:46 ` [PULL 08/13] util/oslib-win32: Do not treat null @errp as &error_warn Markus Armbruster
2025-09-30 12:46 ` [PULL 09/13] ui/pixman: Consistent error handling in qemu_pixman_shareable_free() Markus Armbruster
2025-10-13 9:55 ` Bernhard Beschow
2025-10-13 11:11 ` Markus Armbruster
2025-09-30 12:46 ` Markus Armbruster [this message]
2025-09-30 12:46 ` [PULL 11/13] ui/dbus: Consistent handling of texture mutex failure Markus Armbruster
2025-09-30 16:27 ` Richard Henderson
2025-10-01 6:30 ` Markus Armbruster
2025-09-30 12:46 ` [PULL 12/13] ivshmem-flat: Mark an instance of missing error handling FIXME Markus Armbruster
2025-09-30 12:46 ` [PULL 13/13] error: Kill @error_warn Markus Armbruster
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=20250930124653.321609-11-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=odaki@rsg.ci.i.u-tokyo.ac.jp \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).