commit 7d0f982bfbb92fbfc1bf6c9bcaffe745996a763c
author Marc-André Lureau <marcandre.lureau@redhat.com> Mon Mar 05 18:29:51 2018 +0100
committer Eric Blake <eblake@redhat.com> Mon Mar 19 10:00:14 2018 -0500
tree b8567c1cb092b8a03a501f9142801eaafe41401e
parent 3cf42b8b3af1bd61e736a9ca0f94806c7931ae56

qapi: generate a literal qobject for introspection

Replace the generated json string with a literal qobject. The later is
easier to deal with, at run time as well as compile time: adding #if
conditionals will be easier than in a json string.

The output of query-qmp-schema is not changed.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180305172951.2150-5-marcandre.lureau@redhat.com>
[eblake: fix python 3 failure]
Signed-off-by: Eric Blake <eblake@redhat.com>

monitor.c

diff --git a/monitor.c b/monitor.c
index 3117a3e..d92f02d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -956,7 +956,7 @@
 static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
                                  Error **errp)
 {
-    *ret_data = qobject_from_json(qmp_schema_json, &error_abort);
+    *ret_data = qobject_from_qlit(&qmp_schema_qlit);
 }
 
 /*