mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'pull-qapi-2025-05-28' of https://repo.or.cz/qemu/armbru into staging
QAPI patches patches for 2025-05-28 # -----BEGIN PGP SIGNATURE----- # # iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmg3UTYSHGFybWJydUBy # ZWRoYXQuY29tAAoJEDhwtADrkYZTz9cQALqbici35rI19BYR8XNTcIK1sS6iB9wx # 6vLLix7a+/vsmBXiHEfo6nnlTBsU1NVP+8Tvx8+6TRBUnjK+9YaPZHE8k6lGglWm # 5lbue7nUlzaF4TfTmqrsCeeYKvc8iwC5TUBHbsLNpf9IIvNHbRm4IrD4ySnur+mN # vTQWEvLkT9quh5KPaiZajlQulIpaFZjwREJ2U8LC6Tb+t0qtAGL6hc+etI49re6A # 2jJq29G+hSxK87FBFwgilh4Dl5DCDAe75Plp1Opy0wyowM06ilSATYBJ6SL4B3wg # RKQXmHiHZCxk+MLs3vhE65bhNmMLkf+xbY/jxSNs5Hisj4Snt7bLqWRaBAhkRZOz # ZCyGMI6lpJELo8VIEE2gB8m/kf6YAG4pfLdZkIZCuFyW2I6b3OQjOn5G0td6JtvX # a5ygtuzi8VIxA3FcODb/EMNAPOv6B4aHgW3IaiwLB2kgeiqR+yMIE6zqZZHrEGUl # A/S7an99vbHgSFPtJ37VaUEdDnb06b4ebIvNyBzrgtXO8ekHaXAjCh52UYkLFOJe # S0dBrENj6M1yJ8HPwqWgP25PdlBAbCGHCsaZScrv7j08Q7sNJbQz0mmrCi0V/djV # riZBVcODabQ9mveMc1KJplKwIg351YJk3XwHqMLKHw9srMl3z3YcZf6T3e/G3ScQ # rlqRDslZvvgd # =3NrB # -----END PGP SIGNATURE----- # gpg: Signature made Wed 28 May 2025 14:08:54 EDT # 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 * tag 'pull-qapi-2025-05-28' of https://repo.or.cz/qemu/armbru: qapi: use imperative style in documentation qapi: make all generated files common qapi: remove qapi_specific_outputs from meson.build qapi: make s390x specific CPU commands unconditionally available qapi: make most CPU commands unconditionally available qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic qapi: remove the misc-target.json file qapi: make Xen event commands unconditionally available qapi: make SGX commands unconditionally available qapi: expose query-gic-capability command unconditionally qapi: make SEV commands unconditionally available qapi: expand docs for SEV commands qapi: expose rtc-reset-reinjection command unconditionally Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
@@ -1938,7 +1938,6 @@ F: hw/core/numa.c
|
||||
F: hw/cpu/cluster.c
|
||||
F: qapi/machine.json
|
||||
F: qapi/machine-common.json
|
||||
F: qapi/machine-target.json
|
||||
F: include/hw/boards.h
|
||||
F: include/hw/core/cpu.h
|
||||
F: include/hw/cpu/cluster.h
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
#include "qemu/osdep.h"
|
||||
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
|
||||
#include "xen_evtchn.h"
|
||||
#include "xen_primary_console.h"
|
||||
@@ -38,15 +37,3 @@ void xen_primary_console_create(void)
|
||||
void xen_primary_console_set_be_port(uint16_t port)
|
||||
{
|
||||
}
|
||||
#ifdef TARGET_I386
|
||||
EvtchnInfoList *qmp_xen_event_list(Error **errp)
|
||||
{
|
||||
error_setg(errp, "Xen event channel emulation not enabled");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void qmp_xen_event_inject(uint32_t port, Error **errp)
|
||||
{
|
||||
error_setg(errp, "Xen event channel emulation not enabled");
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "monitor/monitor.h"
|
||||
#include "monitor/hmp.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qapi/qapi-commands-misc-i386.h"
|
||||
#include "qobject/qdict.h"
|
||||
#include "qom/object.h"
|
||||
#include "exec/target_page.h"
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
#include "monitor/monitor.h"
|
||||
#include "qobject/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qapi/qapi-commands-misc-i386.h"
|
||||
#include "hw/i386/x86.h"
|
||||
#include "hw/rtc/mc146818rtc.h"
|
||||
|
||||
|
||||
+1
-1
@@ -3,8 +3,8 @@
|
||||
#include "monitor/hmp-target.h"
|
||||
#include "hw/i386/pc.h"
|
||||
#include "hw/i386/sgx-epc.h"
|
||||
#include "qapi/qapi-commands-misc-i386.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
|
||||
void sgx_epc_build_srat(GArray *table_data)
|
||||
{
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include "monitor/hmp-target.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qapi/qapi-commands-misc-i386.h"
|
||||
#include "system/address-spaces.h"
|
||||
#include "system/hw_accel.h"
|
||||
#include "system/reset.h"
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
#include "target/s390x/cpu.h"
|
||||
#include "hw/s390x/s390-virtio-ccw.h"
|
||||
#include "hw/s390x/cpu-topology.h"
|
||||
#include "qapi/qapi-commands-machine-target.h"
|
||||
#include "qapi/qapi-events-machine-target.h"
|
||||
#include "qapi/qapi-commands-machine-s390x.h"
|
||||
#include "qapi/qapi-events-machine-s390x.h"
|
||||
|
||||
/*
|
||||
* s390_topology is used to keep the topology information.
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
#include "hw/s390x/storage-keys.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-machine.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "qobject/qdict.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "system/memory_mapping.h"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "qemu/queue.h"
|
||||
#include "hw/boards.h"
|
||||
#include "qapi/qapi-types-machine-target.h"
|
||||
#include "qapi/qapi-types-machine-s390x.h"
|
||||
|
||||
#define S390_TOPOLOGY_CPU_IFL 0x03
|
||||
|
||||
|
||||
+1
-1
@@ -533,7 +533,7 @@
|
||||
##
|
||||
# @query-audiodevs:
|
||||
#
|
||||
# Returns information about audiodev configuration
|
||||
# Return information about audiodev configuration
|
||||
#
|
||||
# Returns: array of @Audiodev
|
||||
#
|
||||
|
||||
+1
-1
@@ -83,7 +83,7 @@
|
||||
##
|
||||
# @query-pr-managers:
|
||||
#
|
||||
# Returns a list of information about each persistent reservation
|
||||
# Return a list of information about each persistent reservation
|
||||
# manager.
|
||||
#
|
||||
# Returns: a list of @PRManagerInfo for each persistent reservation
|
||||
|
||||
+2
-2
@@ -34,7 +34,7 @@
|
||||
##
|
||||
# @query-chardev:
|
||||
#
|
||||
# Returns information about current character devices.
|
||||
# Return information about current character devices.
|
||||
#
|
||||
# Returns: a list of @ChardevInfo
|
||||
#
|
||||
@@ -80,7 +80,7 @@
|
||||
##
|
||||
# @query-chardev-backends:
|
||||
#
|
||||
# Returns information about character device backends.
|
||||
# Return information about character device backends.
|
||||
#
|
||||
# Returns: a list of @ChardevBackendInfo
|
||||
#
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@
|
||||
##
|
||||
# @query-version:
|
||||
#
|
||||
# Returns the current version of QEMU.
|
||||
# Return the current version of QEMU.
|
||||
#
|
||||
# Returns: A @VersionInfo object describing the current version of
|
||||
# QEMU.
|
||||
|
||||
+1
-1
@@ -94,7 +94,7 @@
|
||||
##
|
||||
# @query-cryptodev:
|
||||
#
|
||||
# Returns information about current crypto devices.
|
||||
# Return information about current crypto devices.
|
||||
#
|
||||
# Returns: a list of @QCryptodevInfo
|
||||
#
|
||||
|
||||
+1
-1
@@ -195,7 +195,7 @@
|
||||
##
|
||||
# @query-dump-guest-memory-capability:
|
||||
#
|
||||
# Returns the available formats for dump-guest-memory
|
||||
# Return the available formats for dump-guest-memory
|
||||
#
|
||||
# Returns: A @DumpGuestMemoryCapability object listing available
|
||||
# formats for dump-guest-memory
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
# -*- Mode: Python -*-
|
||||
# vim: filetype=python
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
{ 'include': 'machine-common.json' }
|
||||
|
||||
##
|
||||
# @S390CpuPolarization:
|
||||
#
|
||||
# An enumeration of CPU polarization that can be assumed by a virtual
|
||||
# S390 CPU
|
||||
#
|
||||
# Since: 8.2
|
||||
##
|
||||
{ 'enum': 'S390CpuPolarization',
|
||||
'data': [ 'horizontal', 'vertical' ]
|
||||
}
|
||||
|
||||
##
|
||||
# @set-cpu-topology:
|
||||
#
|
||||
# Modify the topology by moving the CPU inside the topology tree, or
|
||||
# by changing a modifier attribute of a CPU. Absent values will not
|
||||
# be modified.
|
||||
#
|
||||
# @core-id: the vCPU ID to be moved
|
||||
#
|
||||
# @socket-id: destination socket to move the vCPU to
|
||||
#
|
||||
# @book-id: destination book to move the vCPU to
|
||||
#
|
||||
# @drawer-id: destination drawer to move the vCPU to
|
||||
#
|
||||
# @entitlement: entitlement to set
|
||||
#
|
||||
# @dedicated: whether the provisioning of real to virtual CPU is
|
||||
# dedicated
|
||||
#
|
||||
# Features:
|
||||
#
|
||||
# @unstable: This command is experimental.
|
||||
#
|
||||
# Since: 8.2
|
||||
##
|
||||
{ 'command': 'set-cpu-topology',
|
||||
'data': {
|
||||
'core-id': 'uint16',
|
||||
'*socket-id': 'uint16',
|
||||
'*book-id': 'uint16',
|
||||
'*drawer-id': 'uint16',
|
||||
'*entitlement': 'S390CpuEntitlement',
|
||||
'*dedicated': 'bool'
|
||||
},
|
||||
'features': [ 'unstable' ]
|
||||
}
|
||||
|
||||
##
|
||||
# @CPU_POLARIZATION_CHANGE:
|
||||
#
|
||||
# Emitted when the guest asks to change the polarization.
|
||||
#
|
||||
# The guest can tell the host (via the PTF instruction) whether the
|
||||
# CPUs should be provisioned using horizontal or vertical
|
||||
# polarization.
|
||||
#
|
||||
# On horizontal polarization the host is expected to provision all
|
||||
# vCPUs equally.
|
||||
#
|
||||
# On vertical polarization the host can provision each vCPU
|
||||
# differently. The guest will get information on the details of the
|
||||
# provisioning the next time it uses the STSI(15) instruction.
|
||||
#
|
||||
# @polarization: polarization specified by the guest
|
||||
#
|
||||
# Features:
|
||||
#
|
||||
# @unstable: This event is experimental.
|
||||
#
|
||||
# Since: 8.2
|
||||
#
|
||||
# .. qmp-example::
|
||||
#
|
||||
# <- { "event": "CPU_POLARIZATION_CHANGE",
|
||||
# "data": { "polarization": "horizontal" },
|
||||
# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } }
|
||||
##
|
||||
{ 'event': 'CPU_POLARIZATION_CHANGE',
|
||||
'data': { 'polarization': 'S390CpuPolarization' },
|
||||
'features': [ 'unstable' ]
|
||||
}
|
||||
|
||||
##
|
||||
# @CpuPolarizationInfo:
|
||||
#
|
||||
# The result of a CPU polarization query.
|
||||
#
|
||||
# @polarization: the CPU polarization
|
||||
#
|
||||
# Since: 8.2
|
||||
##
|
||||
{ 'struct': 'CpuPolarizationInfo',
|
||||
'data': { 'polarization': 'S390CpuPolarization' }
|
||||
}
|
||||
|
||||
##
|
||||
# @query-s390x-cpu-polarization:
|
||||
#
|
||||
# Features:
|
||||
#
|
||||
# @unstable: This command is experimental.
|
||||
#
|
||||
# Returns: the machine's CPU polarization
|
||||
#
|
||||
# Since: 8.2
|
||||
##
|
||||
{ 'command': 'query-s390x-cpu-polarization', 'returns': 'CpuPolarizationInfo',
|
||||
'features': [ 'unstable' ]
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
+367
-4
@@ -99,7 +99,7 @@
|
||||
##
|
||||
# @query-cpus-fast:
|
||||
#
|
||||
# Returns information about all virtual CPUs.
|
||||
# Return information about all virtual CPUs.
|
||||
#
|
||||
# Returns: list of @CpuInfoFast
|
||||
#
|
||||
@@ -467,7 +467,7 @@
|
||||
##
|
||||
# @query-kvm:
|
||||
#
|
||||
# Returns information about KVM acceleration
|
||||
# Return information about KVM acceleration
|
||||
#
|
||||
# Returns: @KvmInfo
|
||||
#
|
||||
@@ -930,7 +930,7 @@
|
||||
##
|
||||
# @query-memdev:
|
||||
#
|
||||
# Returns information for all memory backends.
|
||||
# Return information for all memory backends.
|
||||
#
|
||||
# Returns: a list of @Memdev.
|
||||
#
|
||||
@@ -1235,7 +1235,7 @@
|
||||
##
|
||||
# @query-hv-balloon-status-report:
|
||||
#
|
||||
# Returns the hv-balloon driver data contained in the last received
|
||||
# Return the hv-balloon driver data contained in the last received
|
||||
# "STATUS" message from the guest.
|
||||
#
|
||||
# Returns:
|
||||
@@ -1916,3 +1916,366 @@
|
||||
##
|
||||
{ 'command': 'dump-skeys',
|
||||
'data': { 'filename': 'str' } }
|
||||
|
||||
##
|
||||
# @CpuModelInfo:
|
||||
#
|
||||
# Virtual CPU model.
|
||||
#
|
||||
# A CPU model consists of the name of a CPU definition, to which delta
|
||||
# changes are applied (e.g. features added/removed). Most magic
|
||||
# values that an architecture might require should be hidden behind
|
||||
# the name. However, if required, architectures can expose relevant
|
||||
# properties.
|
||||
#
|
||||
# @name: the name of the CPU definition the model is based on
|
||||
#
|
||||
# @props: a dictionary of QOM properties to be applied
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'struct': 'CpuModelInfo',
|
||||
'data': { 'name': 'str',
|
||||
'*props': 'any' } }
|
||||
|
||||
##
|
||||
# @CpuModelExpansionType:
|
||||
#
|
||||
# An enumeration of CPU model expansion types.
|
||||
#
|
||||
# @static: Expand to a static CPU model, a combination of a static
|
||||
# base model name and property delta changes. As the static base
|
||||
# model will never change, the expanded CPU model will be the
|
||||
# same, independent of QEMU version, machine type, machine
|
||||
# options, and accelerator options. Therefore, the resulting
|
||||
# model can be used by tooling without having to specify a
|
||||
# compatibility machine - e.g. when displaying the "host" model.
|
||||
# The @static CPU models are migration-safe.
|
||||
#
|
||||
# @full: Expand all properties. The produced model is not guaranteed
|
||||
# to be migration-safe, but allows tooling to get an insight and
|
||||
# work with model details.
|
||||
#
|
||||
# .. note:: When a non-migration-safe CPU model is expanded in static
|
||||
# mode, some features enabled by the CPU model may be omitted,
|
||||
# because they can't be implemented by a static CPU model
|
||||
# definition (e.g. cache info passthrough and PMU passthrough in
|
||||
# x86). If you need an accurate representation of the features
|
||||
# enabled by a non-migration-safe CPU model, use @full. If you
|
||||
# need a static representation that will keep ABI compatibility
|
||||
# even when changing QEMU version or machine-type, use @static (but
|
||||
# keep in mind that some features may be omitted).
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'enum': 'CpuModelExpansionType',
|
||||
'data': [ 'static', 'full' ] }
|
||||
|
||||
##
|
||||
# @CpuModelCompareResult:
|
||||
#
|
||||
# An enumeration of CPU model comparison results. The result is
|
||||
# usually calculated using e.g. CPU features or CPU generations.
|
||||
#
|
||||
# @incompatible: If model A is incompatible to model B, model A is not
|
||||
# guaranteed to run where model B runs and the other way around.
|
||||
#
|
||||
# @identical: If model A is identical to model B, model A is
|
||||
# guaranteed to run where model B runs and the other way around.
|
||||
#
|
||||
# @superset: If model A is a superset of model B, model B is
|
||||
# guaranteed to run where model A runs. There are no guarantees
|
||||
# about the other way.
|
||||
#
|
||||
# @subset: If model A is a subset of model B, model A is guaranteed to
|
||||
# run where model B runs. There are no guarantees about the other
|
||||
# way.
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'enum': 'CpuModelCompareResult',
|
||||
'data': [ 'incompatible', 'identical', 'superset', 'subset' ] }
|
||||
|
||||
##
|
||||
# @CpuModelBaselineInfo:
|
||||
#
|
||||
# The result of a CPU model baseline.
|
||||
#
|
||||
# @model: the baselined CpuModelInfo.
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'struct': 'CpuModelBaselineInfo',
|
||||
'data': { 'model': 'CpuModelInfo' } }
|
||||
|
||||
##
|
||||
# @CpuModelCompareInfo:
|
||||
#
|
||||
# The result of a CPU model comparison.
|
||||
#
|
||||
# @result: The result of the compare operation.
|
||||
#
|
||||
# @responsible-properties: List of properties that led to the
|
||||
# comparison result not being identical.
|
||||
#
|
||||
# @responsible-properties is a list of QOM property names that led to
|
||||
# both CPUs not being detected as identical. For identical models,
|
||||
# this list is empty. If a QOM property is read-only, that means
|
||||
# there's no known way to make the CPU models identical. If the
|
||||
# special property name "type" is included, the models are by
|
||||
# definition not identical and cannot be made identical.
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'struct': 'CpuModelCompareInfo',
|
||||
'data': { 'result': 'CpuModelCompareResult',
|
||||
'responsible-properties': ['str'] } }
|
||||
|
||||
##
|
||||
# @query-cpu-model-comparison:
|
||||
#
|
||||
# Compares two CPU models, @modela and @modelb, returning how they
|
||||
# compare in a specific configuration. The results indicates how
|
||||
# both models compare regarding runnability. This result can be
|
||||
# used by tooling to make decisions if a certain CPU model will
|
||||
# run in a certain configuration or if a compatible CPU model has
|
||||
# to be created by baselining.
|
||||
#
|
||||
# Usually, a CPU model is compared against the maximum possible CPU
|
||||
# model of a certain configuration (e.g. the "host" model for KVM).
|
||||
# If that CPU model is identical or a subset, it will run in that
|
||||
# configuration.
|
||||
#
|
||||
# The result returned by this command may be affected by:
|
||||
#
|
||||
# * QEMU version: CPU models may look different depending on the QEMU
|
||||
# version. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * machine-type: CPU model may look different depending on the
|
||||
# machine-type. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * machine options (including accelerator): in some architectures,
|
||||
# CPU models may look different depending on machine and accelerator
|
||||
# options. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * "-cpu" arguments and global properties: arguments to the -cpu
|
||||
# option and global properties may affect expansion of CPU models.
|
||||
# Using query-cpu-model-expansion while using these is not advised.
|
||||
#
|
||||
# Some architectures may not support comparing CPU models. s390x
|
||||
# supports comparing CPU models.
|
||||
#
|
||||
# @modela: description of the first CPU model to compare, referred to
|
||||
# as "model A" in CpuModelCompareResult
|
||||
#
|
||||
# @modelb: description of the second CPU model to compare, referred to
|
||||
# as "model B" in CpuModelCompareResult
|
||||
#
|
||||
# Returns: a CpuModelCompareInfo describing how both CPU models
|
||||
# compare
|
||||
#
|
||||
# Errors:
|
||||
# - if comparing CPU models is not supported by the target
|
||||
# - if a model cannot be used
|
||||
# - if a model contains an unknown cpu definition name, unknown
|
||||
# properties or properties with wrong types.
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'command': 'query-cpu-model-comparison',
|
||||
'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
|
||||
'returns': 'CpuModelCompareInfo' }
|
||||
|
||||
##
|
||||
# @query-cpu-model-baseline:
|
||||
#
|
||||
# Baseline two CPU models, @modela and @modelb, creating a compatible
|
||||
# third model. The created model will always be a static,
|
||||
# migration-safe CPU model (see "static" CPU model expansion for
|
||||
# details).
|
||||
#
|
||||
# This interface can be used by tooling to create a compatible CPU
|
||||
# model out two CPU models. The created CPU model will be identical
|
||||
# to or a subset of both CPU models when comparing them. Therefore,
|
||||
# the created CPU model is guaranteed to run where the given CPU
|
||||
# models run.
|
||||
#
|
||||
# The result returned by this command may be affected by:
|
||||
#
|
||||
# * QEMU version: CPU models may look different depending on the QEMU
|
||||
# version. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * machine-type: CPU model may look different depending on the
|
||||
# machine-type. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * machine options (including accelerator): in some architectures,
|
||||
# CPU models may look different depending on machine and accelerator
|
||||
# options. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * "-cpu" arguments and global properties: arguments to the -cpu
|
||||
# option and global properties may affect expansion of CPU models.
|
||||
# Using query-cpu-model-expansion while using these is not advised.
|
||||
#
|
||||
# Some architectures may not support baselining CPU models. s390x
|
||||
# supports baselining CPU models.
|
||||
#
|
||||
# @modela: description of the first CPU model to baseline
|
||||
#
|
||||
# @modelb: description of the second CPU model to baseline
|
||||
#
|
||||
# Returns: a CpuModelBaselineInfo describing the baselined CPU model
|
||||
#
|
||||
# Errors:
|
||||
# - if baselining CPU models is not supported by the target
|
||||
# - if a model cannot be used
|
||||
# - if a model contains an unknown cpu definition name, unknown
|
||||
# properties or properties with wrong types.
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'command': 'query-cpu-model-baseline',
|
||||
'data': { 'modela': 'CpuModelInfo',
|
||||
'modelb': 'CpuModelInfo' },
|
||||
'returns': 'CpuModelBaselineInfo' }
|
||||
|
||||
##
|
||||
# @CpuModelExpansionInfo:
|
||||
#
|
||||
# The result of a cpu model expansion.
|
||||
#
|
||||
# @model: the expanded CpuModelInfo.
|
||||
#
|
||||
# @deprecated-props: an optional list of properties that are flagged as
|
||||
# deprecated by the CPU vendor. The list depends on the
|
||||
# CpuModelExpansionType: "static" properties are a subset of the
|
||||
# enabled-properties for the expanded model; "full" properties are
|
||||
# a set of properties that are deprecated across all models for
|
||||
# the architecture. (since: 10.1 -- since 9.1 on s390x --).
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'struct': 'CpuModelExpansionInfo',
|
||||
'data': { 'model': 'CpuModelInfo',
|
||||
'*deprecated-props' : ['str'] } }
|
||||
|
||||
##
|
||||
# @query-cpu-model-expansion:
|
||||
#
|
||||
# Expands a given CPU model, @model, (or a combination of CPU model +
|
||||
# additional options) to different granularities, specified by @type,
|
||||
# allowing tooling to get an understanding what a specific CPU model
|
||||
# looks like in QEMU under a certain configuration.
|
||||
#
|
||||
# This interface can be used to query the "host" CPU model.
|
||||
#
|
||||
# The data returned by this command may be affected by:
|
||||
#
|
||||
# * QEMU version: CPU models may look different depending on the QEMU
|
||||
# version. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * machine-type: CPU model may look different depending on the
|
||||
# machine-type. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * machine options (including accelerator): in some architectures,
|
||||
# CPU models may look different depending on machine and accelerator
|
||||
# options. (Except for CPU models reported as "static" in
|
||||
# query-cpu-definitions.)
|
||||
# * "-cpu" arguments and global properties: arguments to the -cpu
|
||||
# option and global properties may affect expansion of CPU models.
|
||||
# Using query-cpu-model-expansion while using these is not advised.
|
||||
#
|
||||
# Some architectures may not support all expansion types. s390x
|
||||
# supports "full" and "static". Arm only supports "full".
|
||||
#
|
||||
# @model: description of the CPU model to expand
|
||||
#
|
||||
# @type: expansion type, specifying how to expand the CPU model
|
||||
#
|
||||
# Returns: a CpuModelExpansionInfo describing the expanded CPU model
|
||||
#
|
||||
# Errors:
|
||||
# - if expanding CPU models is not supported
|
||||
# - if the model cannot be expanded
|
||||
# - if the model contains an unknown CPU definition name, unknown
|
||||
# properties or properties with a wrong type
|
||||
# - if an expansion type is not supported
|
||||
#
|
||||
# Since: 2.8
|
||||
##
|
||||
{ 'command': 'query-cpu-model-expansion',
|
||||
'data': { 'type': 'CpuModelExpansionType',
|
||||
'model': 'CpuModelInfo' },
|
||||
'returns': 'CpuModelExpansionInfo' }
|
||||
|
||||
##
|
||||
# @CpuDefinitionInfo:
|
||||
#
|
||||
# Virtual CPU definition.
|
||||
#
|
||||
# @name: the name of the CPU definition
|
||||
#
|
||||
# @migration-safe: whether a CPU definition can be safely used for
|
||||
# migration in combination with a QEMU compatibility machine when
|
||||
# migrating between different QEMU versions and between hosts with
|
||||
# different sets of (hardware or software) capabilities. If not
|
||||
# provided, information is not available and callers should not
|
||||
# assume the CPU definition to be migration-safe. (since 2.8)
|
||||
#
|
||||
# @static: whether a CPU definition is static and will not change
|
||||
# depending on QEMU version, machine type, machine options and
|
||||
# accelerator options. A static model is always migration-safe.
|
||||
# (since 2.8)
|
||||
#
|
||||
# @unavailable-features: List of properties that prevent the CPU model
|
||||
# from running in the current host. (since 2.8)
|
||||
#
|
||||
# @typename: Type name that can be used as argument to
|
||||
# @device-list-properties, to introspect properties configurable
|
||||
# using -cpu or -global. (since 2.9)
|
||||
#
|
||||
# @alias-of: Name of CPU model this model is an alias for. The target
|
||||
# of the CPU model alias may change depending on the machine type.
|
||||
# Management software is supposed to translate CPU model aliases
|
||||
# in the VM configuration, because aliases may stop being
|
||||
# migration-safe in the future (since 4.1)
|
||||
#
|
||||
# @deprecated: If true, this CPU model is deprecated and may be
|
||||
# removed in some future version of QEMU according to the QEMU
|
||||
# deprecation policy. (since 5.2)
|
||||
#
|
||||
# @unavailable-features is a list of QOM property names that represent
|
||||
# CPU model attributes that prevent the CPU from running. If the QOM
|
||||
# property is read-only, that means there's no known way to make the
|
||||
# CPU model run in the current host. Implementations that choose not
|
||||
# to provide specific information return the property name "type". If
|
||||
# the property is read-write, it means that it MAY be possible to run
|
||||
# the CPU model in the current host if that property is changed.
|
||||
# Management software can use it as hints to suggest or choose an
|
||||
# alternative for the user, or just to generate meaningful error
|
||||
# messages explaining why the CPU model can't be used. If
|
||||
# @unavailable-features is an empty list, the CPU model is runnable
|
||||
# using the current host and machine-type. If @unavailable-features
|
||||
# is not present, runnability information for the CPU is not
|
||||
# available.
|
||||
#
|
||||
# Since: 1.2
|
||||
##
|
||||
{ 'struct': 'CpuDefinitionInfo',
|
||||
'data': { 'name': 'str',
|
||||
'*migration-safe': 'bool',
|
||||
'static': 'bool',
|
||||
'*unavailable-features': [ 'str' ],
|
||||
'typename': 'str',
|
||||
'*alias-of' : 'str',
|
||||
'deprecated' : 'bool' } }
|
||||
|
||||
##
|
||||
# @query-cpu-definitions:
|
||||
#
|
||||
# Return a list of supported virtual CPU definitions
|
||||
#
|
||||
# Returns: a list of CpuDefinitionInfo
|
||||
#
|
||||
# Since: 1.2
|
||||
##
|
||||
{ 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'] }
|
||||
|
||||
+7
-26
@@ -39,10 +39,9 @@ qapi_all_modules = [
|
||||
'job',
|
||||
'machine-common',
|
||||
'machine',
|
||||
'machine-target',
|
||||
'machine-s390x',
|
||||
'migration',
|
||||
'misc',
|
||||
'misc-target',
|
||||
'net',
|
||||
'pragma',
|
||||
'qom',
|
||||
@@ -64,6 +63,8 @@ if have_system
|
||||
'qdev',
|
||||
'pci',
|
||||
'rocker',
|
||||
'misc-arm',
|
||||
'misc-i386',
|
||||
'tpm',
|
||||
'uefi',
|
||||
]
|
||||
@@ -84,14 +85,12 @@ qapi_nonmodule_outputs = [
|
||||
'qapi-emit-events.c', 'qapi-emit-events.h',
|
||||
]
|
||||
|
||||
# First build all sources
|
||||
qapi_util_outputs = [
|
||||
qapi_outputs = qapi_nonmodule_outputs + [
|
||||
'qapi-builtin-types.c', 'qapi-builtin-visit.c',
|
||||
'qapi-builtin-types.h', 'qapi-builtin-visit.h',
|
||||
]
|
||||
|
||||
qapi_inputs = []
|
||||
qapi_specific_outputs = []
|
||||
foreach module : qapi_all_modules
|
||||
qapi_inputs += [ files(module + '.json') ]
|
||||
qapi_module_outputs = [
|
||||
@@ -109,24 +108,17 @@ foreach module : qapi_all_modules
|
||||
'qapi-commands-@0@.trace-events'.format(module),
|
||||
]
|
||||
endif
|
||||
if module.endswith('-target')
|
||||
qapi_specific_outputs += qapi_module_outputs
|
||||
else
|
||||
qapi_util_outputs += qapi_module_outputs
|
||||
endif
|
||||
qapi_outputs += qapi_module_outputs
|
||||
endforeach
|
||||
|
||||
qapi_files = custom_target('shared QAPI source files',
|
||||
output: qapi_util_outputs + qapi_specific_outputs + qapi_nonmodule_outputs,
|
||||
output: qapi_outputs,
|
||||
input: [ files('qapi-schema.json') ],
|
||||
command: [ qapi_gen, '-o', 'qapi', '-b', '@INPUT0@' ],
|
||||
depend_files: [ qapi_inputs, qapi_gen_depends ])
|
||||
|
||||
# Now go through all the outputs and add them to the right sourceset.
|
||||
# These loops must be synchronized with the output of the above custom target.
|
||||
|
||||
i = 0
|
||||
foreach output : qapi_util_outputs
|
||||
foreach output : qapi_outputs
|
||||
if output.endswith('.h')
|
||||
genh += qapi_files[i]
|
||||
endif
|
||||
@@ -136,14 +128,3 @@ foreach output : qapi_util_outputs
|
||||
util_ss.add(qapi_files[i])
|
||||
i = i + 1
|
||||
endforeach
|
||||
|
||||
foreach output : qapi_specific_outputs + qapi_nonmodule_outputs
|
||||
if output.endswith('.h')
|
||||
genh += qapi_files[i]
|
||||
endif
|
||||
if output.endswith('.trace-events')
|
||||
qapi_trace_events += qapi_files[i]
|
||||
endif
|
||||
specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: qapi_files[i])
|
||||
i = i + 1
|
||||
endforeach
|
||||
|
||||
+5
-5
@@ -282,7 +282,7 @@
|
||||
##
|
||||
# @query-migrate:
|
||||
#
|
||||
# Returns information about current migration process. If migration
|
||||
# Return information about current migration process. If migration
|
||||
# is active there will be another json-object with RAM migration
|
||||
# status.
|
||||
#
|
||||
@@ -535,7 +535,7 @@
|
||||
##
|
||||
# @query-migrate-capabilities:
|
||||
#
|
||||
# Returns information about the current migration capabilities status
|
||||
# Return information about the current migration capabilities status
|
||||
#
|
||||
# Returns: @MigrationCapabilityStatus
|
||||
#
|
||||
@@ -1320,7 +1320,7 @@
|
||||
##
|
||||
# @query-migrate-parameters:
|
||||
#
|
||||
# Returns information about the current migration parameters
|
||||
# Return information about the current migration parameters
|
||||
#
|
||||
# Returns: @MigrationParameters
|
||||
#
|
||||
@@ -2294,7 +2294,7 @@
|
||||
##
|
||||
# @query-vcpu-dirty-limit:
|
||||
#
|
||||
# Returns information about virtual CPU dirty page rate limits, if
|
||||
# Return information about virtual CPU dirty page rate limits, if
|
||||
# any.
|
||||
#
|
||||
# Since: 7.1
|
||||
@@ -2327,7 +2327,7 @@
|
||||
##
|
||||
# @query-migrationthreads:
|
||||
#
|
||||
# Returns information of migration threads
|
||||
# Return information of migration threads
|
||||
#
|
||||
# Features:
|
||||
#
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user