diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-12 09:01:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-12 09:01:51 +0100 |
| commit | 704eb1c09963149db4a3407d5ba173ba2a9244bb (patch) | |
| tree | 8a1a55bf1dcb52891615a51a37c06a1b7b3eefa2 /qobject/json-parser.c | |
| parent | 0403b0f539f40a21da60409b825b4653b273ab39 (diff) | |
| parent | 1ceca07e48ead0dd2e41576c81d40e6a91cafefd (diff) | |
| download | qemu-704eb1c09963149db4a3407d5ba173ba2a9244bb.zip qemu-704eb1c09963149db4a3407d5ba173ba2a9244bb.tar.gz qemu-704eb1c09963149db4a3407d5ba173ba2a9244bb.tar.bz2 | |
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
QMP pull request
# gpg: Signature made Mon May 11 14:15:19 2015 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"
* remotes/qmp-unstable/tags/for-upstream:
scripts: qmp-shell: Add verbose flag
scripts: qmp-shell: add transaction subshell
scripts: qmp-shell: Expand support for QMP expressions
scripts: qmp-shell: refactor helpers
MAINTAINERS: New maintainer for QMP and QAPI
json-parser: Accept 'null' in QMP
qobject: Add a special null QObject
qobject: Clean up around qtype_code
QJSON: Use OBJECT_CHECK
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qobject/json-parser.c')
| -rw-r--r-- | qobject/json-parser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 4288267..717cb8f 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -561,6 +561,8 @@ static QObject *parse_keyword(JSONParserContext *ctxt) ret = QOBJECT(qbool_from_int(true)); } else if (token_is_keyword(token, "false")) { ret = QOBJECT(qbool_from_int(false)); + } else if (token_is_keyword(token, "null")) { + ret = qnull(); } else { parse_error(ctxt, token, "invalid keyword `%s'", token_get_value(token)); goto out; |