| Message ID | 1502117160-24655-3-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
Hi Is this based on https://lists.gnu.org/archive/html/qemu-devel/2017-06/msg01894.html ? If so, you should probably keep me signed-off. My patch had also a test :) ----- Original Message ----- > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > include/qapi/qmp/qdict.h | 5 +++++ > qobject/qdict.c | 43 ++++++++++++++++++++++++++++++++++++------- > 2 files changed, 41 insertions(+), 7 deletions(-) > > diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h > index 363e431..3b52481 100644 > --- a/include/qapi/qmp/qdict.h > +++ b/include/qapi/qmp/qdict.h > @@ -56,6 +56,8 @@ void qdict_destroy_obj(QObject *obj); > /* Helpers for int, bool, and string */ > #define qdict_put_int(qdict, key, value) \ > qdict_put(qdict, key, qnum_from_int(value)) > +#define qdict_put_uint(qdict, key, value) \ > + qdict_put(qdict, key, qnum_from_uint(value)) > #define qdict_put_bool(qdict, key, value) \ > qdict_put(qdict, key, qbool_from_bool(value)) > #define qdict_put_str(qdict, key, value) \ > @@ -64,12 +66,15 @@ void qdict_destroy_obj(QObject *obj); > /* High level helpers */ > double qdict_get_double(const QDict *qdict, const char *key); > int64_t qdict_get_int(const QDict *qdict, const char *key); > +uint64_t qdict_get_uint(const QDict *qdict, const char *key); > bool qdict_get_bool(const QDict *qdict, const char *key); > QList *qdict_get_qlist(const QDict *qdict, const char *key); > QDict *qdict_get_qdict(const QDict *qdict, const char *key); > const char *qdict_get_str(const QDict *qdict, const char *key); > int64_t qdict_get_try_int(const QDict *qdict, const char *key, > int64_t def_value); > +uint64_t qdict_get_try_uint(const QDict *qdict, const char *key, > + uint64_t def_value); > bool qdict_get_try_bool(const QDict *qdict, const char *key, bool > def_value); > const char *qdict_get_try_str(const QDict *qdict, const char *key); > > diff --git a/qobject/qdict.c b/qobject/qdict.c > index d795079..be919b9 100644 > --- a/qobject/qdict.c > +++ b/qobject/qdict.c > @@ -189,10 +189,9 @@ double qdict_get_double(const QDict *qdict, const char > *key) > } > > /** > - * qdict_get_int(): Get an integer mapped by @key > + * qdict_get_int(): Get a signed integer mapped by @key > * > - * This function assumes that @key exists and it stores a > - * QNum representable as int. > + * @qdict must map @key to an integer QNum that fits into int64_t. > * > * Return integer mapped by @key. > */ > @@ -202,6 +201,18 @@ int64_t qdict_get_int(const QDict *qdict, const char > *key) > } > > /** > + * qdict_get_uint(): Get an unsigned integer mapped by 'key' > + * > + * @qdict must map @key to an integer QNum that fits into uint64_t. > + * > + * Return integer mapped by 'key'. > + */ > +uint64_t qdict_get_uint(const QDict *qdict, const char *key) > +{ > + return qnum_get_uint(qobject_to_qnum(qdict_get(qdict, key))); > +} > + > +/** > * qdict_get_bool(): Get a bool mapped by @key > * > * This function assumes that @key exists and it stores a > @@ -245,11 +256,10 @@ const char *qdict_get_str(const QDict *qdict, const > char *key) > } > > /** > - * qdict_get_try_int(): Try to get integer mapped by @key > + * qdict_get_try_int(): Try to get signed integer mapped by @key > * > - * Return integer mapped by @key, if it is not present in the > - * dictionary or if the stored object is not a QNum representing an > - * integer, @def_value will be returned. > + * If @qdict maps @key to an integer QNum that fits into int64_t, > + * return it. Else return @def_value. > */ > int64_t qdict_get_try_int(const QDict *qdict, const char *key, > int64_t def_value) > @@ -265,6 +275,25 @@ int64_t qdict_get_try_int(const QDict *qdict, const char > *key, > } > > /** > + * qdict_get_try_uint(): Try to get unsigned integer mapped by 'key' > + * > + * If @qdict maps @key to an integer QNum that fits into uint64_t, > + * return it. Else return @def_value. > + */ > +uint64_t qdict_get_try_uint(const QDict *qdict, const char *key, > + uint64_t def_value) > +{ > + QNum *qnum = qobject_to_qnum(qdict_get(qdict, key)); > + uint64_t val; > + > + if (!qnum || !qnum_get_try_uint(qnum, &val)) { > + return def_value; > + } > + > + return val; > +} > + > +/** > * qdict_get_try_bool(): Try to get a bool mapped by @key > * > * Return bool mapped by @key, if it is not present in the > -- > 2.7.5 > >
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > Hi > > Is this based on https://lists.gnu.org/archive/html/qemu-devel/2017-06/msg01894.html ? I guess not, because I forgot it exists. > If so, you should probably keep me signed-off. I'll replace my patch by yours. > My patch had also a test :) Always welcome.
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index 363e431..3b52481 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -56,6 +56,8 @@ void qdict_destroy_obj(QObject *obj); /* Helpers for int, bool, and string */ #define qdict_put_int(qdict, key, value) \ qdict_put(qdict, key, qnum_from_int(value)) +#define qdict_put_uint(qdict, key, value) \ + qdict_put(qdict, key, qnum_from_uint(value)) #define qdict_put_bool(qdict, key, value) \ qdict_put(qdict, key, qbool_from_bool(value)) #define qdict_put_str(qdict, key, value) \ @@ -64,12 +66,15 @@ void qdict_destroy_obj(QObject *obj); /* High level helpers */ double qdict_get_double(const QDict *qdict, const char *key); int64_t qdict_get_int(const QDict *qdict, const char *key); +uint64_t qdict_get_uint(const QDict *qdict, const char *key); bool qdict_get_bool(const QDict *qdict, const char *key); QList *qdict_get_qlist(const QDict *qdict, const char *key); QDict *qdict_get_qdict(const QDict *qdict, const char *key); const char *qdict_get_str(const QDict *qdict, const char *key); int64_t qdict_get_try_int(const QDict *qdict, const char *key, int64_t def_value); +uint64_t qdict_get_try_uint(const QDict *qdict, const char *key, + uint64_t def_value); bool qdict_get_try_bool(const QDict *qdict, const char *key, bool def_value); const char *qdict_get_try_str(const QDict *qdict, const char *key); diff --git a/qobject/qdict.c b/qobject/qdict.c index d795079..be919b9 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -189,10 +189,9 @@ double qdict_get_double(const QDict *qdict, const char *key) } /** - * qdict_get_int(): Get an integer mapped by @key + * qdict_get_int(): Get a signed integer mapped by @key * - * This function assumes that @key exists and it stores a - * QNum representable as int. + * @qdict must map @key to an integer QNum that fits into int64_t. * * Return integer mapped by @key. */ @@ -202,6 +201,18 @@ int64_t qdict_get_int(const QDict *qdict, const char *key) } /** + * qdict_get_uint(): Get an unsigned integer mapped by 'key' + * + * @qdict must map @key to an integer QNum that fits into uint64_t. + * + * Return integer mapped by 'key'. + */ +uint64_t qdict_get_uint(const QDict *qdict, const char *key) +{ + return qnum_get_uint(qobject_to_qnum(qdict_get(qdict, key))); +} + +/** * qdict_get_bool(): Get a bool mapped by @key * * This function assumes that @key exists and it stores a @@ -245,11 +256,10 @@ const char *qdict_get_str(const QDict *qdict, const char *key) } /** - * qdict_get_try_int(): Try to get integer mapped by @key + * qdict_get_try_int(): Try to get signed integer mapped by @key * - * Return integer mapped by @key, if it is not present in the - * dictionary or if the stored object is not a QNum representing an - * integer, @def_value will be returned. + * If @qdict maps @key to an integer QNum that fits into int64_t, + * return it. Else return @def_value. */ int64_t qdict_get_try_int(const QDict *qdict, const char *key, int64_t def_value) @@ -265,6 +275,25 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key, } /** + * qdict_get_try_uint(): Try to get unsigned integer mapped by 'key' + * + * If @qdict maps @key to an integer QNum that fits into uint64_t, + * return it. Else return @def_value. + */ +uint64_t qdict_get_try_uint(const QDict *qdict, const char *key, + uint64_t def_value) +{ + QNum *qnum = qobject_to_qnum(qdict_get(qdict, key)); + uint64_t val; + + if (!qnum || !qnum_get_try_uint(qnum, &val)) { + return def_value; + } + + return val; +} + +/** * qdict_get_try_bool(): Try to get a bool mapped by @key * * Return bool mapped by @key, if it is not present in the
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- include/qapi/qmp/qdict.h | 5 +++++ qobject/qdict.c | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 7 deletions(-)