Commit f3cec33f08 for qemu.org

commit f3cec33f0881df23771697329d5123a5f201c933
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date:   Tue Feb 24 15:43:32 2026 +0100

    ui/vnc: simplify vnc_init_func error handling

    Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

diff --git a/ui/vnc.c b/ui/vnc.c
index e6860cf4c8..23af83fd6c 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -4321,7 +4321,7 @@ void vnc_parse(const char *str)

 int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
 {
-    Error *local_err = NULL;
+    ERRP_GUARD();
     char *id = (char *)qemu_opts_id(opts);

     if (!id) {
@@ -4329,14 +4329,12 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
         id = vnc_auto_assign_id(opts);
     }

-    vnc_display_init(id, &local_err);
-    if (local_err) {
-        error_propagate(errp, local_err);
+    vnc_display_init(id, errp);
+    if (*errp) {
         return -1;
     }
-    vnc_display_open(id, &local_err);
-    if (local_err != NULL) {
-        error_propagate(errp, local_err);
+    vnc_display_open(id, errp);
+    if (*errp) {
         return -1;
     }
     return 0;