From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 28 Feb 2017 21:27:02 +0000 (+0100)
Subject: monitor: Assert qmp_schema_json[] is sane
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b0f36b23f10d31191d1e5be2c8f01591915ed37f;p=qemu.git

monitor: Assert qmp_schema_json[] is sane

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 <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-17-git-send-email-armbru@redhat.com>
---

diff --git a/monitor.c b/monitor.c
index ae6c4d3ad8..f11893e1c3 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);
 }
 
 /*