[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 35/46] qom: Use return values to check for error where that's sim
From: |
Markus Armbruster |
Subject: |
[PATCH 35/46] qom: Use return values to check for error where that's simpler |
Date: |
Wed, 24 Jun 2020 18:43:33 +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>
---
qom/object.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index f6e9f0e413..326a8de91e 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;
}
@@ -1771,12 +1770,11 @@ static void object_set_link_property(Object *obj,
Visitor *v,
}
if (strcmp(path, "") != 0) {
- new_target = object_resolve_link(obj, name, path, &local_err);
+ new_target = object_resolve_link(obj, name, path, errp);
}
g_free(path);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (!new_target) {
return;
}
--
2.26.2
- Re: [PATCH 03/46] qdev: Smooth error checking of qdev_realize() & friends, (continued)
- [PATCH 09/46] error: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2020/06/24
- [PATCH 12/46] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/06/24
- [PATCH 13/46] qemu-option: Simplify around find_default_by_name(), Markus Armbruster, 2020/06/24
- [PATCH 31/46] qom: Use error_reportf_err() instead of g_printerr() in examples, Markus Armbruster, 2020/06/24
- [PATCH 35/46] qom: Use return values to check for error where that's simpler,
Markus Armbruster <=
- [PATCH 27/46] qapi: Purge error_propagate() from QAPI core, Markus Armbruster, 2020/06/24
- [PATCH 33/46] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/06/24
- [PATCH 25/46] qapi: Smooth visitor error checking in generated code, Markus Armbruster, 2020/06/24
- [PATCH 23/46] qapi: Smooth error checking with Coccinelle, Markus Armbruster, 2020/06/24