Re: [PATCH v2 2/3] qom/object_interfaces: Make object_set_properties_from_qdict return bool

[Zhao Liu]

On Mon, Mar 18, 2024 at 11:32:09AM +0800, Zhenzhong Duan wrote:
> Date: Mon, 18 Mar 2024 11:32:09 +0800
> From: Zhenzhong Duan 
> Subject: [PATCH v2 2/3] qom/object_interfaces: Make
>  object_set_properties_from_qdict return bool
> X-Mailer: git-send-email 2.34.1
> 
> Make object_set_properties_from_qdict() return bool, so that
> user_creatable_add_type() could check its return value instead
> of local_err pointer.
> 
> Opportunistically, do the same change to check return value of
> object_property_try_add_child() instead of local_err pointer.
> 
> Suggested-by: Zhao Liu 
> Signed-off-by: Zhenzhong Duan 
> ---
>  qom/object_interfaces.c | 21 ++---
>  1 file changed, 10 insertions(+), 11 deletions(-)

Reviewed-by: Zhao Liu 

[PATCH v2 2/3] qom/object_interfaces: Make object_set_properties_from_qdict return bool

[Zhenzhong Duan]

Make object_set_properties_from_qdict() return bool, so that
user_creatable_add_type() could check its return value instead
of local_err pointer.

Opportunistically, do the same change to check return value of
object_property_try_add_child() instead of local_err pointer.

Suggested-by: Zhao Liu 
Signed-off-by: Zhenzhong Duan 
---
 qom/object_interfaces.c | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 70179877f1..e17e2de46d 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -43,22 +43,25 @@ bool user_creatable_can_be_deleted(UserCreatable *uc)
 }
 }
 
-static void object_set_properties_from_qdict(Object *obj, const QDict *qdict,
+static bool object_set_properties_from_qdict(Object *obj, const QDict *qdict,
  Visitor *v, Error **errp)
 {
 const QDictEntry *e;
+bool ret;
 
 if (!visit_start_struct(v, NULL, NULL, 0, errp)) {
-return;
+return false;
 }
 for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
-if (!object_property_set(obj, e->key, v, errp)) {
+ret = object_property_set(obj, e->key, v, errp);
+if (!ret) {
 goto out;
 }
 }
-visit_check_struct(v, errp);
+ret = visit_check_struct(v, errp);
 out:
 visit_end_struct(v, NULL);
+return ret;
 }
 
 void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
@@ -109,17 +112,13 @@ Object *user_creatable_add_type(const char *type, const 
char *id,
 
 assert(qdict);
 obj = object_new(type);
-object_set_properties_from_qdict(obj, qdict, v, _err);
-if (local_err) {
+if (!object_set_properties_from_qdict(obj, qdict, v, _err)) {
 goto err;
 }
 
-if (id != NULL) {
-object_property_try_add_child(object_get_objects_root(),
-  id, obj, _err);
-if (local_err) {
+if (id != NULL && !object_property_try_add_child(object_get_objects_root(),
+ id, obj, _err)) {
 goto err;
-}
 }
 
 if (!user_creatable_complete(USER_CREATABLE(obj), _err)) {
-- 
2.34.1