| Message ID | 20170509173559.31598-11-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > include/qom/object.h | 23 +++++++++++++++++++++++ > qom/object.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 56 insertions(+) > > diff --git a/include/qom/object.h b/include/qom/object.h > index cd0f412ce9..abaeb8cf4e 100644 > --- a/include/qom/object.h > +++ b/include/qom/object.h > @@ -1094,6 +1094,29 @@ int64_t object_property_get_int(Object *obj, const char *name, > Error **errp); > > /** > + * object_property_set_uint: > + * @value: the value to be written to the property > + * @name: the name of the property > + * @errp: returns an error if this function fails > + * > + * Writes an unsigned integer value to a property. > + */ > +void object_property_set_uint(Object *obj, uint64_t value, > + const char *name, Error **errp); > + > +/** > + * object_property_get_uint: > + * @obj: the object > + * @name: the name of the property > + * @errp: returns an error if this function fails > + * > + * Returns: the value of the property, converted to an unsigned integer, or 0 > + * an error occurs (including when the property value is not an integer). > + */ > +uint64_t object_property_get_uint(Object *obj, const char *name, > + Error **errp); > + > +/** > * object_property_get_enum: > * @obj: the object > * @name: the name of the property > diff --git a/qom/object.c b/qom/object.c > index c1644dbcb7..a9259e330d 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -1221,6 +1221,39 @@ int64_t object_property_get_int(Object *obj, const char *name, > return retval; > } > > +void object_property_set_uint(Object *obj, uint64_t value, > + const char *name, Error **errp) > +{ > + QNum *qn = qnum_from_uint(value); Please call the variable @qnum, to match object_property_set_int() and object_property_get_uint(). Blank line here. > + object_property_set_qobject(obj, QOBJECT(qn), name, errp); > + QDECREF(qn); > +} > + > +uint64_t object_property_get_uint(Object *obj, const char *name, > + Error **errp) > +{ > + QObject *ret = object_property_get_qobject(obj, name, errp); > + Error *err = NULL; > + QNum *qnum; > + uint64_t retval; > + > + if (!ret) { > + return 0; > + } > + qnum = qobject_to_qnum(ret); > + if (qnum) { > + retval = qnum_get_uint(qnum, &err); > + } > + > + if (!qnum || err) { > + error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "uint"); > + retval = 0; > + } > + > + qobject_decref(ret); > + return retval; > +} > + > typedef struct EnumProperty { > const char * const *strings; > int (*get)(Object *, Error **); With the nits touched up: Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/include/qom/object.h b/include/qom/object.h index cd0f412ce9..abaeb8cf4e 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1094,6 +1094,29 @@ int64_t object_property_get_int(Object *obj, const char *name, Error **errp); /** + * object_property_set_uint: + * @value: the value to be written to the property + * @name: the name of the property + * @errp: returns an error if this function fails + * + * Writes an unsigned integer value to a property. + */ +void object_property_set_uint(Object *obj, uint64_t value, + const char *name, Error **errp); + +/** + * object_property_get_uint: + * @obj: the object + * @name: the name of the property + * @errp: returns an error if this function fails + * + * Returns: the value of the property, converted to an unsigned integer, or 0 + * an error occurs (including when the property value is not an integer). + */ +uint64_t object_property_get_uint(Object *obj, const char *name, + Error **errp); + +/** * object_property_get_enum: * @obj: the object * @name: the name of the property diff --git a/qom/object.c b/qom/object.c index c1644dbcb7..a9259e330d 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1221,6 +1221,39 @@ int64_t object_property_get_int(Object *obj, const char *name, return retval; } +void object_property_set_uint(Object *obj, uint64_t value, + const char *name, Error **errp) +{ + QNum *qn = qnum_from_uint(value); + object_property_set_qobject(obj, QOBJECT(qn), name, errp); + QDECREF(qn); +} + +uint64_t object_property_get_uint(Object *obj, const char *name, + Error **errp) +{ + QObject *ret = object_property_get_qobject(obj, name, errp); + Error *err = NULL; + QNum *qnum; + uint64_t retval; + + if (!ret) { + return 0; + } + qnum = qobject_to_qnum(ret); + if (qnum) { + retval = qnum_get_uint(qnum, &err); + } + + if (!qnum || err) { + error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "uint"); + retval = 0; + } + + qobject_decref(ret); + return retval; +} + typedef struct EnumProperty { const char * const *strings; int (*get)(Object *, Error **);
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- include/qom/object.h | 23 +++++++++++++++++++++++ qom/object.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+)