diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-04 14:15:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-04 14:15:35 +0000 |
| commit | 1ba089f2255bfdb071be3ce6ac6c3069e8012179 (patch) | |
| tree | 4fb5645e5c3db6ceca5d12e5980345a51fe2af1b /qobject/json-parser.c | |
| parent | db754f8ccaf2f073c9aed46a4389e9c0c2080399 (diff) | |
| parent | 88daf0996cd0488e93e67bcb0af258f2c24f117a (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2021-02-04' into staging
QMP patches patches for 2021-02-04
# gpg: Signature made Thu 04 Feb 2021 12:21:47 GMT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qmp-2021-02-04:
qmp: Resume OOB-enabled monitor before processing the request
qmp: Add more tracepoints
qmp: Fix up comments after commit 9ce44e2ce2
docs/interop/qmp-spec: Document the request queue limit
qobject: braces {} are necessary for all arms of this statement
qobject: spaces required around that operators
qobject: code indent should never use tabs
qobject: open brace '{' following struct go on the same line
monitor/qmp-cmds.c: Don't include ui/vnc.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qobject/json-parser.c')
| -rw-r--r-- | qobject/json-parser.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qobject/json-parser.c b/qobject/json-parser.c index d351039b10..008b326fb8 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -31,8 +31,7 @@ struct JSONToken { char str[]; }; -typedef struct JSONParserContext -{ +typedef struct JSONParserContext { Error *err; JSONToken *current; GQueue *buf; |