diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-17 21:38:24 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-22 19:52:17 +0100 |
| commit | bbf1028a0ade883cebae5faf984f0e78cb794b17 (patch) | |
| tree | 75b023523f03d7371b26bf6fcc4d73f74dd52e32 | |
| parent | dfad9ec4e9f15344f300996ad8c6f3eaf699d195 (diff) | |
| download | focaccia-qemu-bbf1028a0ade883cebae5faf984f0e78cb794b17.tar.gz focaccia-qemu-bbf1028a0ade883cebae5faf984f0e78cb794b17.zip | |
monitor: Clean up handle_hmp_command() a bit
Leave checking qobject_type(req) to qmp_check_input_obj(). Rework handling of json_parser_parse_err() failing without setting an error. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1487363905-9480-14-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | monitor.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c index 493bed977c..1e352a6d37 100644 --- a/monitor.c +++ b/monitor.c @@ -3735,10 +3735,11 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) Error *err = NULL; req = json_parser_parse_err(tokens, NULL, &err); - if (err || !req || qobject_type(req) != QTYPE_QDICT) { - if (!err) { - error_setg(&err, QERR_JSON_PARSING); - } + if (!req && !err) { + /* json_parser_parse_err() sucks: can fail without setting @err */ + error_setg(&err, QERR_JSON_PARSING); + } + if (err) { goto err_out; } |