From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 1 Aug 2025 16:39:58 +0000 (+0100)
Subject: qom: use ERRP_GUARD in user_creatable_complete
X-Git-Tag: v10.2.0-rc1~44^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7249713b4f3a0c0ae5e83015f9889d1c3d75218d;p=thirdparty%2Fqemu.git

qom: use ERRP_GUARD in user_creatable_complete

With error_propagate, the stack trace from any error_abort/fatal
usage will start from the error_propagate() call, which is largely
useless. Using ERRP_GUARD ensures the stack trace starts from
the origin that reported the error.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 1ffea1a7288..415cbee8c5c 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -24,13 +24,12 @@
 bool user_creatable_complete(UserCreatable *uc, Error **errp)
 {
     UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);
-    Error *err = NULL;
+    ERRP_GUARD();
 
     if (ucc->complete) {
-        ucc->complete(uc, &err);
-        error_propagate(errp, err);
+        ucc->complete(uc, errp);
     }
-    return !err;
+    return !*errp;
 }
 
 bool user_creatable_can_be_deleted(UserCreatable *uc)