summaryrefslogtreecommitdiffstats
path: root/qapi/machine.json
diff options
context:
space:
mode:
authorMarkus Armbruster2019-07-09 17:20:53 +0200
committerMarkus Armbruster2019-08-21 13:24:01 +0200
commitffaee83bcb28913b8b854aeab78b1a1f2115712d (patch)
tree3c328442c829bd4471262b3cc8ac1034085125fe /qapi/machine.json
parenthw/core: Move cpu.c, cpu.h from qom/ to hw/core/ (diff)
downloadqemu-ffaee83bcb28913b8b854aeab78b1a1f2115712d.tar.gz
qemu-ffaee83bcb28913b8b854aeab78b1a1f2115712d.tar.xz
qemu-ffaee83bcb28913b8b854aeab78b1a1f2115712d.zip
qapi: Move query-target from misc.json to machine.json
Move query-target and its return type TargetInfo from misc.json to machine.json, where they are covered by MAINTAINERS section "Machine core". Also move its implementation from arch_init.c to hw/core/machine-qmp-cmds, where it is likewise covered. All users of SysEmuTarget are now in machine.json. Move it there from common.json. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190709152053.16670-3-armbru@redhat.com>
Diffstat (limited to 'qapi/machine.json')
-rw-r--r--qapi/machine.json48
1 files changed, 47 insertions, 1 deletions
diff --git a/qapi/machine.json b/qapi/machine.json
index 6db8a7e2ec..de5c742d72 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -7,7 +7,30 @@
# = Machines
##
-{ 'include': 'common.json' }
+##
+# @SysEmuTarget:
+#
+# The comprehensive enumeration of QEMU system emulation ("softmmu")
+# targets. Run "./configure --help" in the project root directory, and
+# look for the *-softmmu targets near the "--target-list" option. The
+# individual target constants are not documented here, for the time
+# being.
+#
+# Notes: The resulting QMP strings can be appended to the "qemu-system-"
+# prefix to produce the corresponding QEMU executable name. This
+# is true even for "qemu-system-x86_64".
+#
+# ppcemb: dropped in 3.1
+#
+# Since: 3.0
+##
+{ 'enum' : 'SysEmuTarget',
+ 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32',
+ 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
+ 'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc',
+ 'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4',
+ 'sh4eb', 'sparc', 'sparc64', 'tricore', 'unicore32',
+ 'x86_64', 'xtensa', 'xtensaeb' ] }
##
# @CpuInfoArch:
@@ -369,6 +392,29 @@
{ 'command': 'query-current-machine', 'returns': 'CurrentMachineParams' }
##
+# @TargetInfo:
+#
+# Information describing the QEMU target.
+#
+# @arch: the target architecture
+#
+# Since: 1.2.0
+##
+{ 'struct': 'TargetInfo',
+ 'data': { 'arch': 'SysEmuTarget' } }
+
+##
+# @query-target:
+#
+# Return information about the target for this QEMU
+#
+# Returns: TargetInfo
+#
+# Since: 1.2.0
+##
+{ 'command': 'query-target', 'returns': 'TargetInfo' }
+
+##
# @NumaOptionsType:
#
# @node: NUMA nodes configuration