From 7249713b4f3a0c0ae5e83015f9889d1c3d75218d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 1 Aug 2025 17:39:58 +0100 Subject: [PATCH] qom: use ERRP_GUARD in user_creatable_complete MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Markus Armbruster Signed-off-by: Daniel P. Berrangé --- qom/object_interfaces.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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) -- 2.47.3