diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-08-23 18:40:06 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-08-24 20:26:37 +0200 |
| commit | 84a56f38b23440cb3127eaffe4e495826a29f18c (patch) | |
| tree | 72568216f6f179211145382816ea90db38befe2f /include | |
| parent | 2cbd15aa6f4d4694376dd0d231d56e572ac870c1 (diff) | |
| download | qemu-84a56f38b23440cb3127eaffe4e495826a29f18c.zip qemu-84a56f38b23440cb3127eaffe4e495826a29f18c.tar.gz qemu-84a56f38b23440cb3127eaffe4e495826a29f18c.tar.bz2 | |
json: Pass lexical errors and limit violations to callback
The callback to consume JSON values takes QObject *json, Error *err.
If both are null, the callback is supposed to make up an error by
itself. This sucks.
qjson.c's consume_json() neglects to do so, which makes
qobject_from_json() null instead of failing. I consider that a bug.
The culprit is json_message_process_token(): it passes two null
pointers when it runs into a lexical error or a limit violation. Fix
it to pass a proper Error object then. Update the callbacks:
* monitor.c's handle_qmp_command(): the code to make up an error is
now dead, drop it.
* qga/main.c's process_event(): lumps the "both null" case together
with the "not a JSON object" case. The former is now gone. The
error message "Invalid JSON syntax" is misleading for the latter.
Improve it to "Input must be a JSON object".
* qobject/qjson.c's consume_json(): no update; check-qjson
demonstrates qobject_from_json() now sets an error on lexical
errors, but still doesn't on some other errors.
* tests/libqtest.c's qmp_response(): the Error object is now reliable,
so use it to improve the error message.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-40-armbru@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qapi/qmp/qerror.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index c82360f..145571f 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -61,9 +61,6 @@ #define QERR_IO_ERROR \ "An IO error has occurred" -#define QERR_JSON_PARSING \ - "Invalid JSON syntax" - #define QERR_MIGRATION_ACTIVE \ "There's a migration process in progress" |