[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 16/24] monitor: Assert qmp_schema_json[] is sane
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v3 16/24] monitor: Assert qmp_schema_json[] is sane |
Date: |
Tue, 7 Mar 2017 08:20:29 +0100 |
qmp_query_qmp_schema() parses qmp_schema_json[] with
qobject_from_json(). This must not fail, so pass &error_abort.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
---
monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/monitor.c b/monitor.c
index ae6c4d3..f11893e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -953,7 +953,7 @@ EventInfoList *qmp_query_events(Error **errp)
static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
Error **errp)
{
- *ret_data = qobject_from_json(qmp_schema_json, NULL);
+ *ret_data = qobject_from_json(qmp_schema_json, &error_abort);
}
/*
--
2.7.4
- [Qemu-devel] [PULL v3 06/24] qapi: Factor out common part of qobject input visitor creation, (continued)
- [Qemu-devel] [PULL v3 06/24] qapi: Factor out common part of qobject input visitor creation, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 22/24] qapi: Improve how keyval input visitor reports unexpected dicts, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 18/24] qapi: New parse_qapi_name(), Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 23/24] docs/qapi-code-gen.txt: Clarify naming rules, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 05/24] test-keyval: Cover use with qobject input visitor, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 03/24] keyval: New keyval_parse(), Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 20/24] qapi: New qobject_input_visitor_new_str() for convenience, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json(), Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 04/24] qapi: qobject input visitor variant for use with keyval_parse(), Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 12/24] qobject: Propagate parse errors through qobject_from_json(), Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 16/24] monitor: Assert qmp_schema_json[] is sane,
Markus Armbruster <=
- [Qemu-devel] [PULL v3 13/24] block: More detailed syntax error reporting for JSON filenames, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 21/24] block: Initial implementation of -blockdev, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 08/24] qobject: Propagate parse errors through qobject_from_jsonv(), Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 14/24] check-qjson: Test errors from qobject_from_json(), Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 24/24] keyval: Support lists, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 17/24] test-qapi-util: New, covering qapi/qapi-util.c, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 02/24] tests: Fix gcov-files-test-qemu-opts-y, gcov-files-test-logging-y, Markus Armbruster, 2017/03/07
- [Qemu-devel] [PULL v3 19/24] keyval: Restrict key components to valid QAPI names, Markus Armbruster, 2017/03/07
- Re: [Qemu-devel] [PULL v3 00/24] block: Command line option -blockdev, no-reply, 2017/03/07
- Re: [Qemu-devel] [PULL v3 00/24] block: Command line option -blockdev, Peter Maydell, 2017/03/07