diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-06-26 13:52:24 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-07-24 13:35:11 +0200 |
| commit | 006ca09f3027d86346fce707e9295975c6558f42 (patch) | |
| tree | 1c06825264666d09ea76e3e4e2673fc089027b65 /qobject | |
| parent | df95f1a298a3e16c80293343143dcedbe7978f6c (diff) | |
| download | qemu-006ca09f3027d86346fce707e9295975c6558f42.tar.gz | |
qapi: Separate type QNull from QObject
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'qobject')
| -rw-r--r-- | qobject/json-parser.c | 2 | ||||
| -rw-r--r-- | qobject/qnull.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 7a417f20cd..724ca240e4 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -445,7 +445,7 @@ static QObject *parse_keyword(JSONParserContext *ctxt) } else if (!strcmp(token->str, "false")) { return QOBJECT(qbool_from_bool(false)); } else if (!strcmp(token->str, "null")) { - return qnull(); + return QOBJECT(qnull()); } parse_error(ctxt, token, "invalid keyword '%s'", token->str); return NULL; diff --git a/qobject/qnull.c b/qobject/qnull.c index c124d0585e..69a21d1059 100644 --- a/qobject/qnull.c +++ b/qobject/qnull.c @@ -14,7 +14,9 @@ #include "qemu-common.h" #include "qapi/qmp/qobject.h" -QObject qnull_ = { - .type = QTYPE_QNULL, - .refcnt = 1, +QNull qnull_ = { + .base = { + .type = QTYPE_QNULL, + .refcnt = 1, + }, }; |