diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-06-07 20:35:58 +0400 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-06-20 14:31:31 +0200 |
| commit | 01b2ffcedd94ad7b42bc870e4c6936c87ad03429 (patch) | |
| tree | 39bbadfbbaa229bfbda245840a256fe0132b2390 /tests/test-qmp-event.c | |
| parent | 58634047b7deeab36e4b07c4744e44d698975561 (diff) | |
| download | focaccia-qemu-01b2ffcedd94ad7b42bc870e4c6936c87ad03429.tar.gz focaccia-qemu-01b2ffcedd94ad7b42bc870e4c6936c87ad03429.zip | |
qapi: merge QInt and QFloat in QNum
We would like to use a same QObject type to represent numbers, whether they are int, uint, or floats. Getters will allow some compatibility between the various types if the number fits other representations. Add a few more tests while at it. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20170607163635.17635-7-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [parse_stats_intervals() simplified a bit, comment in test_visitor_in_int_overflow() tidied up, suppress bogus warnings] Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/test-qmp-event.c')
| -rw-r--r-- | tests/test-qmp-event.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index 4c0f09601d..9fb3c5e81e 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -18,7 +18,6 @@ #include "test-qapi-visit.h" #include "test-qapi-event.h" #include "qapi/qmp/types.h" -#include "qapi/qmp/qint.h" #include "qapi/qmp/qobject.h" #include "qapi/qmp-event.h" @@ -41,6 +40,7 @@ void qdict_cmp_do_simple(const char *key, QObject *obj1, void *opaque) { QObject *obj2; QDictCmpData d_new, *d = opaque; + int64_t val1, val2; if (!d->result) { return; @@ -62,9 +62,10 @@ void qdict_cmp_do_simple(const char *key, QObject *obj1, void *opaque) d->result = (qbool_get_bool(qobject_to_qbool(obj1)) == qbool_get_bool(qobject_to_qbool(obj2))); return; - case QTYPE_QINT: - d->result = (qint_get_int(qobject_to_qint(obj1)) == - qint_get_int(qobject_to_qint(obj2))); + case QTYPE_QNUM: + g_assert(qnum_get_try_int(qobject_to_qnum(obj1), &val1)); + g_assert(qnum_get_try_int(qobject_to_qnum(obj2), &val2)); + d->result = val1 == val2; return; case QTYPE_QSTRING: d->result = g_strcmp0(qstring_get_str(qobject_to_qstring(obj1)), |