diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-17 13:32:25 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-17 13:32:25 +0000 |
| commit | 6c599282f8ab382fe59f03a6cae755b89561a7b3 (patch) | |
| tree | 85492f9cb8329bb9fff18aeef2f0f8a4c948e2c8 /monitor/monitor-internal.h | |
| parent | 652c5bbd7e7d3cb3d27a2e0590118dc79fb6f4d8 (diff) | |
| parent | ec95fcc8bae624e87c7601d2d4baf7c519c3814e (diff) | |
| download | focaccia-qemu-6c599282f8ab382fe59f03a6cae755b89561a7b3.tar.gz focaccia-qemu-6c599282f8ab382fe59f03a6cae755b89561a7b3.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2020-02-15-v2' into staging
Monitor patches for 2020-02-15 # gpg: Signature made Mon 17 Feb 2020 13:26:20 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-monitor-2020-02-15-v2: qemu-doc: Clarify extent of build platform support monitor: Move qmp_query_qmp_schema to qmp-cmds-control.c monitor: Collect "control" command handlers in qmp-cmds.control.c qapi: Split control.json off misc.json monitor: Move monitor option parsing to monitor/monitor.c Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor/monitor-internal.h')
| -rw-r--r-- | monitor/monitor-internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index d78f5ca190..3e6baba88f 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -27,6 +27,7 @@ #include "chardev/char-fe.h" #include "monitor/monitor.h" +#include "qapi/qapi-types-control.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qemu/readline.h" @@ -179,4 +180,7 @@ void help_cmd(Monitor *mon, const char *name); void handle_hmp_command(MonitorHMP *mon, const char *cmdline); int hmp_compare_cmd(const char *name, const char *list); +void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data, + Error **errp); + #endif |