qemu-e2k/include/qapi
Markus Armbruster 84a56f38b2 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>
2018-08-24 20:26:37 +02:00
..
qmp json: Pass lexical errors and limit violations to callback 2018-08-24 20:26:37 +02:00
clone-visitor.h Include less of the generated modular QAPI headers 2018-03-02 13:45:50 -06:00
dealloc-visitor.h include: Fix typos found by codespell 2017-01-24 23:26:52 +03:00
error.h Include less of the generated modular QAPI headers 2018-03-02 13:45:50 -06:00
opts-visitor.h Move include qemu/option.h from qemu-common.h to actual users 2018-02-09 13:52:16 +01:00
qmp-event.h Include qapi/qmp/qdict.h exactly where needed 2018-02-09 13:52:15 +01:00
qobject-input-visitor.h Include qapi/qmp/qobject.h exactly where needed 2018-02-09 13:52:15 +01:00
qobject-output-visitor.h Include qapi/qmp/qobject.h exactly where needed 2018-02-09 13:52:15 +01:00
string-input-visitor.h string-input-visitor: Favor new visit_free() function 2016-07-06 10:52:04 +02:00
string-output-visitor.h qapi: Add new visit_complete() function 2016-07-06 10:52:04 +02:00
util.h qapi: Change data type of the FOO_lookup generated for enum FOO 2017-09-04 13:09:13 +02:00
visitor-impl.h qapi: Use QNull for a more regular visit_type_null() 2017-07-24 13:35:11 +02:00
visitor.h qapi: Move qapi-schema.json to qapi/, rename generated files 2018-03-02 13:45:57 -06:00