OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

monitor: Move qmp_query_qmp_schema to qmp-cmds-control.c

Browse Source 
monitor/misc.c contains code that works only in the system emulator, so
it can't be linked to tools like a storage daemon. In order to make
schema introspection available for tools, move the function to
monitor/qmp-cmds-control.c, which can be linked into the storage daemon.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200129102239.31435-5-kwolf@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Kevin Wolf 2020-01-29 11:22:39 +01:00 committed by Markus Armbruster
parent 567628163e
commit 7d3f505359
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
monitor/misc.c
View File

@ -75,7 +75,6 @@
#include "qapi/qapi-init-commands.h" #include "qapi/qapi-init-commands.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp-event.h" #include "qapi/qmp-event.h"
#include "qapi/qapi-introspect.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "tcg/tcg.h" #include "tcg/tcg.h"
@ -232,21 +231,6 @@ static void hmp_info_help(Monitor *mon, const QDict *qdict)
help_cmd(mon, "info"); help_cmd(mon, "info");
} }
/*
* Minor hack: generated marshalling suppressed for this command
* ('gen': false in the schema) so we can parse the JSON string
* directly into QObject instead of first parsing it with
* visit_type_SchemaInfoList() into a SchemaInfoList, then marshal it
* to QObject with generated output marshallers, every time. Instead,
* we do it in test-qobject-input-visitor.c, just to make sure
* qapi-gen.py's output actually conforms to the schema.
*/
static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
Error **errp)
{
*ret_data = qobject_from_qlit(&qmp_schema_qlit);
}
static void monitor_init_qmp_commands(void) static void monitor_init_qmp_commands(void)
{ {
/* /*

3
monitor/monitor-internal.h
View File

@ -180,4 +180,7 @@ void help_cmd(Monitor *mon, const char *name);
void handle_hmp_command(MonitorHMP *mon, const char *cmdline); void handle_hmp_command(MonitorHMP *mon, const char *cmdline);
int hmp_compare_cmd(const char *name, const char *list); int hmp_compare_cmd(const char *name, const char *list);
void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
Error **errp);
#endif #endif

16
monitor/qmp-cmds-control.c
View File

@ -29,6 +29,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-control.h"
#include "qapi/qapi-emit-events.h" #include "qapi/qapi-emit-events.h"
#include "qapi/qapi-introspect.h"
/* /*
* Accept QMP capabilities in @list for @mon. * Accept QMP capabilities in @list for @mon.
@ -151,3 +152,18 @@ EventInfoList *qmp_query_events(Error **errp)
return ev_list; return ev_list;
} }
/*
* Minor hack: generated marshalling suppressed for this command
* ('gen': false in the schema) so we can parse the JSON string
* directly into QObject instead of first parsing it with
* visit_type_SchemaInfoList() into a SchemaInfoList, then marshal it
* to QObject with generated output marshallers, every time. Instead,
* we do it in test-qobject-input-visitor.c, just to make sure
* qapi-gen.py's output actually conforms to the schema.
*/
void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
Error **errp)
{
*ret_data = qobject_from_qlit(&qmp_schema_qlit);
}