qlit: add qobject_from_qlit()
Instantiate a QObject* from a literal QLitObject. LitObject only supports int64_t for now. uint64_t and double aren't implemented. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20180305172951.2150-4-marcandre.lureau@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
3d96ea44d4
commit
3cf42b8b3a
@ -50,4 +50,6 @@ struct QLitDictEntry {
|
||||
|
||||
bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs);
|
||||
|
||||
QObject *qobject_from_qlit(const QLitObject *qlit);
|
||||
|
||||
#endif /* QLIT_H */
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "qapi/qmp/qnum.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
#include "qapi/qmp/qnull.h"
|
||||
|
||||
static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict)
|
||||
{
|
||||
@ -86,3 +87,39 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
QObject *qobject_from_qlit(const QLitObject *qlit)
|
||||
{
|
||||
switch (qlit->type) {
|
||||
case QTYPE_QNULL:
|
||||
return QOBJECT(qnull());
|
||||
case QTYPE_QNUM:
|
||||
return QOBJECT(qnum_from_int(qlit->value.qnum));
|
||||
case QTYPE_QSTRING:
|
||||
return QOBJECT(qstring_from_str(qlit->value.qstr));
|
||||
case QTYPE_QDICT: {
|
||||
QDict *qdict = qdict_new();
|
||||
QLitDictEntry *e;
|
||||
|
||||
for (e = qlit->value.qdict; e->key; e++) {
|
||||
qdict_put_obj(qdict, e->key, qobject_from_qlit(&e->value));
|
||||
}
|
||||
return QOBJECT(qdict);
|
||||
}
|
||||
case QTYPE_QLIST: {
|
||||
QList *qlist = qlist_new();
|
||||
QLitObject *e;
|
||||
|
||||
for (e = qlit->value.qlist; e->type != QTYPE_NONE; e++) {
|
||||
qlist_append_obj(qlist, qobject_from_qlit(e));
|
||||
}
|
||||
return QOBJECT(qlist);
|
||||
}
|
||||
case QTYPE_QBOOL:
|
||||
return QOBJECT(qbool_from_bool(qlit->value.qbool));
|
||||
default:
|
||||
assert(0);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
@ -9,9 +9,11 @@
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
|
||||
#include "qapi/qmp/qbool.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qlist.h"
|
||||
#include "qapi/qmp/qlit.h"
|
||||
#include "qapi/qmp/qnum.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
|
||||
static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) {
|
||||
@ -63,11 +65,37 @@ static void qlit_equal_qobject_test(void)
|
||||
qobject_decref(qobj);
|
||||
}
|
||||
|
||||
static void qobject_from_qlit_test(void)
|
||||
{
|
||||
QObject *obj, *qobj = qobject_from_qlit(&qlit);
|
||||
QDict *qdict;
|
||||
QList *bee;
|
||||
|
||||
qdict = qobject_to_qdict(qobj);
|
||||
g_assert_cmpint(qdict_get_int(qdict, "foo"), ==, 42);
|
||||
g_assert_cmpstr(qdict_get_str(qdict, "bar"), ==, "hello world");
|
||||
g_assert(qobject_type(qdict_get(qdict, "baz")) == QTYPE_QNULL);
|
||||
|
||||
bee = qdict_get_qlist(qdict, "bee");
|
||||
obj = qlist_pop(bee);
|
||||
g_assert_cmpint(qnum_get_int(qobject_to_qnum(obj)), ==, 43);
|
||||
qobject_decref(obj);
|
||||
obj = qlist_pop(bee);
|
||||
g_assert_cmpint(qnum_get_int(qobject_to_qnum(obj)), ==, 44);
|
||||
qobject_decref(obj);
|
||||
obj = qlist_pop(bee);
|
||||
g_assert(qbool_get_bool(qobject_to_qbool(obj)));
|
||||
qobject_decref(obj);
|
||||
|
||||
qobject_decref(qobj);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
g_test_add_func("/qlit/equal_qobject", qlit_equal_qobject_test);
|
||||
g_test_add_func("/qlit/qobject_from_qlit", qobject_from_qlit_test);
|
||||
|
||||
return g_test_run();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user