[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 01/50] qlit: add qobject_from_qlit()
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v3 01/50] qlit: add qobject_from_qlit() |
Date: |
Wed, 06 Dec 2017 15:37:31 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Marc-André Lureau <address@hidden> writes:
> Instanciate a QObject* form a literal QLitObject.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
> include/qapi/qmp/qlit.h | 2 ++
> qobject/qlit.c | 36 ++++++++++++++++++++++++++++++++++++
> tests/check-qlit.c | 26 ++++++++++++++++++++++++++
> 3 files changed, 64 insertions(+)
>
> diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h
> index b18406bce9..56feb25e04 100644
> --- a/include/qapi/qmp/qlit.h
> +++ b/include/qapi/qmp/qlit.h
> @@ -51,4 +51,6 @@ struct QLitDictEntry {
>
> bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs);
>
> +QObject *qobject_from_qlit(const QLitObject *qlit);
> +
> #endif /* QLIT_H */
> diff --git a/qobject/qlit.c b/qobject/qlit.c
> index 3c4882c784..df2ad97d33 100644
> --- a/qobject/qlit.c
> +++ b/qobject/qlit.c
> @@ -82,3 +82,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));
> + case QTYPE_NONE:
Please make that
default:
to remove the compiler's license to have the function return null on
corrupted qlit->type. If compilers gripe unless you keep case
QTYPE_NONE in place, keep it.
> + assert(0);
> + }
> +
> + return NULL;
> +}
> diff --git a/tests/check-qlit.c b/tests/check-qlit.c
> index c59ec1ab88..acd6e02e96 100644
> --- a/tests/check-qlit.c
> +++ b/tests/check-qlit.c
> @@ -64,11 +64,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();
> }
With the assertion tightened and the typos pointed out by Eric fixed:
Reviewed-by: Markus Armbruster <address@hidden>
- Re: [Qemu-devel] [PATCH v3 01/50] qlit: add qobject_from_qlit(),
Markus Armbruster <=