[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 24/44] qom: Use return values to check for error where that's
From: |
Markus Armbruster |
Subject: |
[PATCH v3 24/44] qom: Use return values to check for error where that's simpler |
Date: |
Mon, 6 Jul 2020 10:09:30 +0200 |
When using the Error object to check for error, we need to receive it
into a local variable, then propagate() it to @errp.
Using the return value permits allows receiving it straight to @errp.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
qom/object.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index 0808da2767..3a7c062f8e 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -549,8 +549,7 @@ void object_initialize_child_with_propsv(Object *parentobj,
object_initialize(childobj, size, type);
obj = OBJECT(childobj);
- object_set_propv(obj, &local_err, vargs);
- if (local_err) {
+ if (object_set_propv(obj, errp, vargs) < 0) {
goto out;
}
@@ -743,7 +742,7 @@ Object *object_new_with_propv(const char *typename,
}
obj = object_new_with_type(klass->type);
- if (object_set_propv(obj, &local_err, vargs) < 0) {
+ if (object_set_propv(obj, errp, vargs) < 0) {
goto error;
}
@@ -1763,20 +1762,24 @@ static void object_set_link_property(Object *obj,
Visitor *v,
LinkProperty *prop = opaque;
Object **targetp = object_link_get_targetp(obj, prop);
Object *old_target = *targetp;
- Object *new_target = NULL;
+ Object *new_target;
char *path = NULL;
- visit_type_str(v, name, &path, &local_err);
+ if (!visit_type_str(v, name, &path, errp)) {
+ return;
+ }
- if (!local_err && strcmp(path, "") != 0) {
- new_target = object_resolve_link(obj, name, path, &local_err);
+ if (*path) {
+ new_target = object_resolve_link(obj, name, path, errp);
+ if (!new_target) {
+ g_free(path);
+ return;
+ }
+ } else {
+ new_target = NULL;
}
g_free(path);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
prop->check(obj, name, new_target, &local_err);
if (local_err) {
--
2.26.2
- [PATCH v3 00/44] Less clumsy error checking, Markus Armbruster, 2020/07/06
- [PATCH v3 11/44] qemu-option: Replace opt_set() by cleaner opt_validate(), Markus Armbruster, 2020/07/06
- [PATCH v3 01/44] error: Improve examples in error.h's big comment, Markus Armbruster, 2020/07/06
- [PATCH v3 04/44] macio: Tidy up error handling in macio_newworld_realize(), Markus Armbruster, 2020/07/06
- [PATCH v3 07/44] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/06
- [PATCH v3 09/44] qemu-option: Simplify around find_default_by_name(), Markus Armbruster, 2020/07/06
- [PATCH v3 14/44] block: Avoid error accumulation in bdrv_img_create(), Markus Armbruster, 2020/07/06
- [PATCH v3 24/44] qom: Use return values to check for error where that's simpler,
Markus Armbruster <=
- [PATCH v3 02/44] error: Document Error API usage rules, Markus Armbruster, 2020/07/06
- [PATCH v3 15/44] hmp: Eliminate a variable in hmp_migrate_set_parameter(), Markus Armbruster, 2020/07/06
- [PATCH v3 08/44] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/06
- [PATCH v3 22/44] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/07/06
- [PATCH v3 21/44] qom: Rename qdev_get_type() to object_get_type(), Markus Armbruster, 2020/07/06
- [PATCH v3 10/44] qemu-option: Factor out helper opt_create(), Markus Armbruster, 2020/07/06
- [PATCH v3 06/44] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/06