diff options
| author | Peter Maydell | 2020-02-17 14:32:25 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-02-17 14:32:25 +0100 |
| commit | 6c599282f8ab382fe59f03a6cae755b89561a7b3 (patch) | |
| tree | 85492f9cb8329bb9fff18aeef2f0f8a4c948e2c8 /monitor/qmp-cmds.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-re... (diff) | |
| parent | qemu-doc: Clarify extent of build platform support (diff) | |
| download | qemu-6c599282f8ab382fe59f03a6cae755b89561a7b3.tar.gz qemu-6c599282f8ab382fe59f03a6cae755b89561a7b3.tar.xz 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/qmp-cmds.c')
| -rw-r--r-- | monitor/qmp-cmds.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index c6faa3eaf0..da7083087e 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qemu-version.h" #include "qemu/cutils.h" #include "qemu/option.h" #include "monitor/monitor.h" @@ -32,6 +31,7 @@ #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qapi/qapi-commands-block-core.h" +#include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-ui.h" @@ -51,19 +51,6 @@ NameInfo *qmp_query_name(Error **errp) return info; } -VersionInfo *qmp_query_version(Error **errp) -{ - VersionInfo *info = g_new0(VersionInfo, 1); - - info->qemu = g_new0(VersionTriple, 1); - info->qemu->major = QEMU_VERSION_MAJOR; - info->qemu->minor = QEMU_VERSION_MINOR; - info->qemu->micro = QEMU_VERSION_MICRO; - info->package = g_strdup(QEMU_PKGVERSION); - - return info; -} - KvmInfo *qmp_query_kvm(Error **errp) { KvmInfo *info = g_malloc0(sizeof(*info)); |