qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: odaki@rsg.ci.i.u-tokyo.ac.jp, marcandre.lureau@redhat.com
Subject: [PATCH 11/12] ui/dbus: Consistent handling of texture mutex failure
Date: Fri,  8 Aug 2025 10:08:22 +0200	[thread overview]
Message-ID: <20250808080823.2638861-12-armbru@redhat.com> (raw)
In-Reply-To: <20250808080823.2638861-1-armbru@redhat.com>

We report d3d_texture2d_acquire0() and d3d_texture2d_release0()
failure as error, except in dbus_update_gl_cb(), where we report it as
warning.  Report it as error there as well.

Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 ui/dbus-listener.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 09d7a319b1..b82e7c7115 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -214,26 +214,31 @@ static void dbus_update_gl_cb(GObject *source_object,
                               GAsyncResult *res,
                               gpointer user_data)
 {
-    g_autoptr(GError) err = NULL;
+    g_autoptr(GError) gerr = NULL;
+#ifdef WIN32
+    Error **err = NULL;
+#endif
     DBusDisplayListener *ddl = user_data;
     bool success;
 
 #ifdef CONFIG_GBM
     success = qemu_dbus_display1_listener_call_update_dmabuf_finish(
-        ddl->proxy, res, &err);
+        ddl->proxy, res, &gerr);
     if (!success) {
-        error_report("Failed to call update: %s", err->message);
+        error_report("Failed to call update: %s", gerr->message);
     }
 #endif
 
 #ifdef WIN32
     success = qemu_dbus_display1_listener_win32_d3d11_call_update_texture2d_finish(
-        ddl->d3d11_proxy, res, &err);
+        ddl->d3d11_proxy, res, &gerr);
     if (!success) {
-        error_report("Failed to call update: %s", err->message);
+        error_report("Failed to call update: %s", gerr->message);
     }
 
-    d3d_texture2d_acquire0(ddl->d3d_texture, &error_warn);
+    if (!d3d_texture2d_acquire0(ddl->d3d_texture, &err)) {
+        error_report_err(err);
+    }
 #endif
 
     graphic_hw_gl_block(ddl->dcl.con, false);
-- 
2.49.0



  parent reply	other threads:[~2025-08-08  8:11 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-08  8:08 [PATCH 00/12] Error reporting cleanup, a fix, and &error_warn removal Markus Armbruster
2025-08-08  8:08 ` [PATCH 01/12] monitor: Clean up HMP gdbserver error reporting Markus Armbruster
2025-08-19 10:53   ` Daniel P. Berrangé
2025-09-09 11:22     ` Markus Armbruster
2025-08-08  8:08 ` [PATCH 02/12] tcg: Fix error reporting on mprotect() failure in tcg_region_init() Markus Armbruster
2025-08-08 14:00   ` Philippe Mathieu-Daudé
2025-08-19 10:56     ` Daniel P. Berrangé
2025-08-19 10:56   ` Daniel P. Berrangé
2025-08-08  8:08 ` [PATCH 03/12] hw/cxl: Convert cxl_fmws_link() to Error Markus Armbruster
2025-08-08 10:44   ` Jonathan Cameron via
2025-08-08 11:13     ` Markus Armbruster
2025-09-17 10:46       ` Markus Armbruster
2025-08-11 10:36   ` Philippe Mathieu-Daudé
2025-08-08  8:08 ` [PATCH 04/12] migration/cpr: Clean up error reporting in cpr_resave_fd() Markus Armbruster
2025-08-08 12:38   ` Steven Sistare
2025-08-08 13:55   ` Philippe Mathieu-Daudé
2025-08-08 14:08     ` Steven Sistare
2025-08-08 14:43       ` Markus Armbruster
2025-08-08 14:48         ` Steven Sistare
2025-08-08 15:04           ` Markus Armbruster
2025-08-08  8:08 ` [PATCH 05/12] hw/remote/vfio-user: Clean up error reporting Markus Armbruster
2025-08-08  8:08 ` [PATCH 06/12] net/slirp: " Markus Armbruster
2025-08-08  8:18   ` Marc-André Lureau
2025-08-19 11:10   ` Daniel P. Berrangé
2025-09-09 11:40     ` Markus Armbruster
2025-09-12 10:09       ` Daniel P. Berrangé
2025-08-08  8:08 ` [PATCH 07/12] ui/spice-core: " Markus Armbruster
2025-08-08  8:22   ` Marc-André Lureau
2025-08-19 11:15   ` Daniel P. Berrangé
2025-09-09 11:41     ` Markus Armbruster
2025-09-12 10:10       ` Daniel P. Berrangé
2025-08-08  8:08 ` [PATCH 08/12] util/oslib-win32: Revert warning on WSAEventSelect() failure Markus Armbruster
2025-08-08  8:22   ` Marc-André Lureau
2025-08-08  9:32     ` Markus Armbruster
2025-08-19 11:24   ` Daniel P. Berrangé
2025-09-09 11:50     ` Markus Armbruster
2025-09-12 10:13       ` Daniel P. Berrangé
2025-08-08  8:08 ` [PATCH 09/12] ui/pixman: Consistent error handling in qemu_pixman_shareable_free() Markus Armbruster
2025-08-08  8:16   ` Marc-André Lureau
2025-08-08  8:08 ` [PATCH 10/12] ui/dbus: Clean up dbus_update_gl_cb() error checking Markus Armbruster
2025-08-08  8:14   ` Marc-André Lureau
2025-08-08  8:08 ` Markus Armbruster [this message]
2025-08-08  8:15   ` [PATCH 11/12] ui/dbus: Consistent handling of texture mutex failure Marc-André Lureau
2025-08-08  8:08 ` [PATCH 12/12] error: Kill @error_warn Markus Armbruster
2025-08-08 14:02   ` Philippe Mathieu-Daudé
2025-08-08 14:45     ` Markus Armbruster
2025-08-09  7:07   ` Akihiko Odaki
2025-08-09  8:30     ` Markus Armbruster
2025-08-09 10:27       ` Akihiko Odaki
2025-08-09 14:42         ` Markus Armbruster
2025-08-19 11:26   ` Daniel P. Berrangé
2025-09-16 11:27     ` 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=20250808080823.2638861-12-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=odaki@rsg.ci.i.u-tokyo.ac.jp \
    --cc=qemu-devel@nongnu.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).