Commit 6c6084c1 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qlit: add QLIT_QNULL and QLIT_BOOL 



As they are going to be used in the following patches.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20170825105913.4060-9-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent e2346a19

include/qapi/qmp/qlit.h

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ typedef struct QLitObject QLitObject; 
struct QLitObject {

    int type;

    union {

        bool qbool;

        int64_t qnum;

        const char *qstr;

        QLitDictEntry *qdict;
@@ -35,6 +36,10 @@ struct QLitDictEntry { 
    QLitObject value;

};



#define QLIT_QNULL \

    { .type = QTYPE_QNULL }

#define QLIT_QBOOL(val) \

    { .type = QTYPE_QBOOL, .value.qbool = (val) }

#define QLIT_QNUM(val) \

    { .type = QTYPE_QNUM, .value.qnum = (val) }

#define QLIT_QSTR(val) \

qobject/qlit.c

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs) 
    }



    switch (lhs->type) {

    case QTYPE_QBOOL:

        return lhs->value.qbool == qbool_get_bool(qobject_to_qbool(rhs));

    case QTYPE_QNUM:

        g_assert(qnum_get_try_int(qobject_to_qnum(rhs), &val));

        return lhs->value.qnum == val;
@@ -81,6 +83,8 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs) 


        return helper.result;

    }

    case QTYPE_QNULL:

        return true;

    default:

        break;

    }