[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 30/45] qom: Make functions taking Error ** return bool, not 0/
From: |
Markus Armbruster |
Subject: |
[PATCH v4 30/45] qom: Make functions taking Error ** return bool, not 0/-1 |
Date: |
Tue, 7 Jul 2020 18:05:58 +0200 |
Just for consistency. Also fix the example in object_set_props()'s
documentation.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
include/qom/object.h | 28 +++++++++++-----------------
qom/object.c | 14 +++++++-------
2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 189f8ecbf6..04271ea5de 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -729,15 +729,13 @@ void object_apply_compat_props(Object *obj);
* Error *err = NULL;
* Object *obj = ...get / create object...;
*
- * obj = object_set_props(obj,
- * &err,
- * "share", "yes",
- * "mem-path", "/dev/shm/somefile",
- * "prealloc", "yes",
- * "size", "1048576",
- * NULL);
- *
- * if (!obj) {
+ * if (!object_set_props(obj,
+ * &err,
+ * "share", "yes",
+ * "mem-path", "/dev/shm/somefile",
+ * "prealloc", "yes",
+ * "size", "1048576",
+ * NULL)) {
* error_reportf_err(err, "Cannot set properties: ");
* }
* </programlisting>
@@ -746,11 +744,9 @@ void object_apply_compat_props(Object *obj);
* The returned object will have one stable reference maintained
* for as long as it is present in the object hierarchy.
*
- * Returns: -1 on error, 0 on success
+ * Returns: %true on success, %false on error.
*/
-int object_set_props(Object *obj,
- Error **errp,
- ...) QEMU_SENTINEL;
+bool object_set_props(Object *obj, Error **errp, ...) QEMU_SENTINEL;
/**
* object_set_propv:
@@ -760,11 +756,9 @@ int object_set_props(Object *obj,
*
* See object_set_props() for documentation.
*
- * Returns: -1 on error, 0 on success
+ * Returns: %true on success, %false on error.
*/
-int object_set_propv(Object *obj,
- Error **errp,
- va_list vargs);
+bool object_set_propv(Object *obj, Error **errp, va_list vargs);
/**
* object_initialize:
diff --git a/qom/object.c b/qom/object.c
index 25c5ddb78f..97c4e0af07 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -557,7 +557,7 @@ bool object_initialize_child_with_propsv(Object *parentobj,
object_initialize(childobj, size, type);
obj = OBJECT(childobj);
- if (object_set_propv(obj, errp, vargs) < 0) {
+ if (!object_set_propv(obj, errp, vargs)) {
goto out;
}
@@ -752,7 +752,7 @@ Object *object_new_with_propv(const char *typename,
}
obj = object_new_with_type(klass->type);
- if (object_set_propv(obj, errp, vargs) < 0) {
+ if (!object_set_propv(obj, errp, vargs)) {
goto error;
}
@@ -780,12 +780,12 @@ Object *object_new_with_propv(const char *typename,
}
-int object_set_props(Object *obj,
+bool object_set_props(Object *obj,
Error **errp,
...)
{
va_list vargs;
- int ret;
+ bool ret;
va_start(vargs, errp);
ret = object_set_propv(obj, errp, vargs);
@@ -795,7 +795,7 @@ int object_set_props(Object *obj,
}
-int object_set_propv(Object *obj,
+bool object_set_propv(Object *obj,
Error **errp,
va_list vargs)
{
@@ -809,12 +809,12 @@ int object_set_propv(Object *obj,
g_assert(value != NULL);
if (!object_property_parse(obj, propname, value, &local_err)) {
error_propagate(errp, local_err);
- return -1;
+ return false;
}
propname = va_arg(vargs, char *);
}
- return 0;
+ return true;
}
--
2.26.2
- [PATCH v4 11/45] qemu-option: Factor out helper opt_create(), (continued)
- [PATCH v4 11/45] qemu-option: Factor out helper opt_create(), Markus Armbruster, 2020/07/07
- [PATCH v4 04/45] qdev: Use returned bool to check for qdev_realize() etc. failure, Markus Armbruster, 2020/07/07
- [PATCH v4 12/45] qemu-option: Replace opt_set() by cleaner opt_validate(), Markus Armbruster, 2020/07/07
- [PATCH v4 08/45] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/07
- [PATCH v4 15/45] block: Avoid error accumulation in bdrv_img_create(), Markus Armbruster, 2020/07/07
- [PATCH v4 09/45] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/07
- [PATCH v4 23/45] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/07/07
- [PATCH v4 13/45] qemu-option: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/07
- [PATCH v4 10/45] qemu-option: Simplify around find_default_by_name(), Markus Armbruster, 2020/07/07
- [PATCH v4 30/45] qom: Make functions taking Error ** return bool, not 0/-1,
Markus Armbruster <=
- [PATCH v4 14/45] qemu-option: Use returned bool to check for failure, Markus Armbruster, 2020/07/07
- [PATCH v4 20/45] s390x/pci: Fix harmless mistake in zpci's property fid's setter, Markus Armbruster, 2020/07/07
- [PATCH v4 06/45] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/07
- [PATCH v4 07/45] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/07
- [PATCH v4 19/45] qapi: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/07
- [PATCH v4 29/45] qom: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/07
- [PATCH v4 31/45] qdev: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/07
- [PATCH v4 24/45] qom: Don't handle impossible object_property_get_link() failure, Markus Armbruster, 2020/07/07
- [PATCH v4 18/45] qapi: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/07
- [PATCH v4 16/45] hmp: Eliminate a variable in hmp_migrate_set_parameter(), Markus Armbruster, 2020/07/07