vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qom: Make functions taking Error ** return bool, not 0/-1 

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>
Message-Id: <20200707160613.848843-31-armbru@redhat.com>
master
Markus Armbruster 2020-07-07 18:05:58 +02:00
parent f07ad48d46
commit b783f54d60
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/qom/object.h
View File

@ -729,15 +729,13 @@ void object_apply_compat_props(Object *obj);
* Error *err = NULL; * Error *err = NULL;
* Object *obj = ...get / create object...; * Object *obj = ...get / create object...;
* *
* obj = object_set_props(obj, * if (!object_set_props(obj,
* &err, * &err,
* "share", "yes", * "share", "yes",
* "mem-path", "/dev/shm/somefile", * "mem-path", "/dev/shm/somefile",
* "prealloc", "yes", * "prealloc", "yes",
* "size", "1048576", * "size", "1048576",
* NULL); * NULL)) {
*
* if (!obj) {
* error_reportf_err(err, "Cannot set properties: "); * error_reportf_err(err, "Cannot set properties: ");
* } * }
* </programlisting> * </programlisting>
@ -746,11 +744,9 @@ void object_apply_compat_props(Object *obj);
* The returned object will have one stable reference maintained * The returned object will have one stable reference maintained
* for as long as it is present in the object hierarchy. * 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, bool object_set_props(Object *obj, Error **errp, ...) QEMU_SENTINEL;
Error **errp,
...) QEMU_SENTINEL;
/** /**
* object_set_propv: * object_set_propv:
@ -760,11 +756,9 @@ int object_set_props(Object *obj,
* *
* See object_set_props() for documentation. * 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, bool object_set_propv(Object *obj, Error **errp, va_list vargs);
Error **errp,
va_list vargs);
/** /**
* object_initialize: * object_initialize:

14
qom/object.c
View File

@ -557,7 +557,7 @@ bool object_initialize_child_with_propsv(Object *parentobj,
object_initialize(childobj, size, type); object_initialize(childobj, size, type);
obj = OBJECT(childobj); obj = OBJECT(childobj);
if (object_set_propv(obj, errp, vargs) < 0) { if (!object_set_propv(obj, errp, vargs)) {
goto out; goto out;
} }
@ -752,7 +752,7 @@ Object *object_new_with_propv(const char *typename,
} }
obj = object_new_with_type(klass->type); obj = object_new_with_type(klass->type);
if (object_set_propv(obj, errp, vargs) < 0) { if (!object_set_propv(obj, errp, vargs)) {
goto error; 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, Error **errp,
...) ...)
{ {
va_list vargs; va_list vargs;
int ret; bool ret;
va_start(vargs, errp); va_start(vargs, errp);
ret = object_set_propv(obj, errp, vargs); 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, Error **errp,
va_list vargs) va_list vargs)
{ {
@ -809,12 +809,12 @@ int object_set_propv(Object *obj,
g_assert(value != NULL); g_assert(value != NULL);
if (!object_property_parse(obj, propname, value, &local_err)) { if (!object_property_parse(obj, propname, value, &local_err)) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return -1; return false;
} }
propname = va_arg(vargs, char *); propname = va_arg(vargs, char *);
} }
return 0; return true;
} }