From: John Snow <[email protected]> Signed-off-by: John Snow <[email protected]> Message-ID: <[email protected]> Reviewed-by: Markus Armbruster <[email protected]> Signed-off-by: Markus Armbruster <[email protected]> --- qapi/machine.json | 195 ++++++++++++++++------------------------------ 1 file changed, 68 insertions(+), 127 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json index b1be5608b6..4a1fa6911b 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -46,9 +46,8 @@ ## # @S390CpuState: -# -# An enumeration of cpu states that can be assumed by a virtual S390 -# CPU +# An enumeration of cpu states that can be assumed by a virtual +# S390 CPU # # Since: 2.12 ## @@ -57,8 +56,7 @@ ## # @CpuInfoS390: -# -# Additional information about a virtual S390 CPU +# Additional information about a virtual S390 CPU # # @cpu-state: the virtual CPU's state # @@ -75,8 +73,7 @@ ## # @CpuInfoFast: -# -# Information about a virtual CPU +# Information about a virtual CPU # # @cpu-index: index of the virtual CPU # @@ -105,8 +102,7 @@ ## # @query-cpus-fast: -# -# Return information about all virtual CPUs. +# Return information about all virtual CPUs. # # Since: 2.12 # @@ -143,9 +139,8 @@ ## # @CompatProperty: -# -# Property default values specific to a machine type, for use by -# scripts/compare-machine-types. +# Property default values specific to a machine type, for use by +# scripts/compare-machine-types. # # @qom-type: name of the QOM type to which the default applies # @@ -163,8 +158,7 @@ ## # @MachineInfo: -# -# Information describing a machine. +# Information describing a machine. # # @name: the name of the machine # @@ -219,8 +213,7 @@ ## # @query-machines: -# -# Return a list of supported machines +# Return a list of supported machines # # @compat-props: if true, also return compatibility properties. # (default: false) (since 9.1) @@ -261,8 +254,7 @@ ## # @CurrentMachineParams: -# -# Information describing the running machine parameters. +# Information describing the running machine parameters. # # @wakeup-suspend-support: true if the machine supports wake up from # suspend @@ -274,8 +266,7 @@ ## # @query-current-machine: -# -# Return information on the current virtual machine. +# Return information on the current virtual machine. # # Since: 4.0 ## @@ -283,8 +274,8 @@ ## # @QemuTargetInfo: -# -# Information on the target configuration built into the QEMU binary. +# Information on the target configuration built into the QEMU +# binary. # # @arch: the target architecture # @@ -295,8 +286,7 @@ ## # @query-target: -# -# Return information about the target for this QEMU +# Return information about the target for this QEMU # # Since: 1.2 ## @@ -304,8 +294,7 @@ ## # @UuidInfo: -# -# Guest UUID information (Universally Unique Identifier). +# Guest UUID information (Universally Unique Identifier). # # @UUID: the UUID of the guest # @@ -318,8 +307,7 @@ ## # @query-uuid: -# -# Query the guest UUID information. +# Query the guest UUID information. # # Since: 0.14 # @@ -332,8 +320,7 @@ ## # @GuidInfo: -# -# GUID information. +# GUID information. # # @guid: the globally unique identifier # @@ -343,8 +330,7 @@ ## # @query-vm-generation-id: -# -# Show Virtual Machine Generation ID +# Show Virtual Machine Generation ID # # Since: 2.9 ## @@ -352,8 +338,7 @@ ## # @system_reset: -# -# Performs a hard reset of a guest. +# Performs a hard reset of a guest. # # Since: 0.14 # @@ -366,8 +351,7 @@ ## # @system_powerdown: -# -# Requests that a guest perform a powerdown operation. +# Requests that a guest perform a powerdown operation. # # Since: 0.14 # @@ -527,8 +511,7 @@ ## # @NumaDistOptions: -# -# Set the distance between 2 NUMA nodes. +# Set the distance between 2 NUMA nodes. # # @src: source NUMA node. # @@ -548,8 +531,7 @@ ## # @CXLFixedMemoryWindowOptions: -# -# Create a CXL Fixed Memory Window +# Create a CXL Fixed Memory Window # # @size: Size of the Fixed Memory Window in bytes. Must be a multiple # of 256MiB. @@ -599,8 +581,7 @@ ## # @CXLFMWProperties: -# -# List of CXL Fixed Memory Windows. +# List of CXL Fixed Memory Windows. # # @cxl-fmw: List of `CXLFixedMemoryWindowOptions` # @@ -612,8 +593,7 @@ ## # @X86CPURegister32: -# -# A X86 32-bit register +# A X86 32-bit register # # Since: 1.5 ## @@ -622,8 +602,7 @@ ## # @X86CPUFeatureWordInfo: -# -# Information about a X86 CPU feature word +# Information about a X86 CPU feature word # # @cpuid-input-eax: Input EAX value for CPUID instruction for that # feature word @@ -645,9 +624,8 @@ ## # @DummyForceArrays: -# -# Not used by QMP; hack to let us use X86CPUFeatureWordInfoList -# internally +# Not used by QMP; hack to let us use X86CPUFeatureWordInfoList +# internally # # Since: 2.5 ## @@ -829,8 +807,7 @@ ## # @memsave: -# -# Save a portion of guest memory to a file. +# Save a portion of guest memory to a file. # # @val: the virtual address of the guest to start from # @@ -862,8 +839,7 @@ ## # @pmemsave: -# -# Save a portion of guest physical memory to a file. +# Save a portion of guest physical memory to a file. # # @val: the physical address of the guest to start from # @@ -891,8 +867,7 @@ ## # @Memdev: -# -# Information about memory backend +# Information about memory backend # # @id: backend's ID if backend has 'id' property (since 2.9) # @@ -932,8 +907,7 @@ ## # @query-memdev: -# -# Return information for all memory backends. +# Return information for all memory backends. # # Since: 2.1 # @@ -1108,9 +1082,9 @@ ## # @set-numa-node: -# -# Runtime equivalent of '-numa' CLI option, available at preconfigure -# stage to configure numa mapping before initializing machine. +# Runtime equivalent of '-numa' CLI option, available at +# preconfigure stage to configure numa mapping before initializing +# machine. # # Since: 3.0 ## @@ -1121,8 +1095,7 @@ ## # @balloon: -# -# Request the balloon driver to change its balloon size. +# Request the balloon driver to change its balloon size. # # @value: the target logical size of the VM in bytes. We can deduce # the size of the balloon using this formula: @@ -1156,8 +1129,7 @@ ## # @BalloonInfo: -# -# Information about the guest balloon device. +# Information about the guest balloon device. # # @actual: the logical size of the VM in bytes. Formula used: # logical_vm_size = vm_ram_size - balloon_size @@ -1168,8 +1140,7 @@ ## # @query-balloon: -# -# Return information about the balloon device. +# Return information about the balloon device. # # Errors: # - If the balloon driver is enabled but not functional because @@ -1213,8 +1184,7 @@ ## # @HvBalloonInfo: -# -# hv-balloon guest-provided memory status information. +# hv-balloon guest-provided memory status information. # # @committed: the amount of memory in use inside the guest plus the # amount of the memory unusable inside the guest (ballooned out, @@ -1230,9 +1200,8 @@ ## # @query-hv-balloon-status-report: -# -# Return the hv-balloon driver data contained in the last received -# "STATUS" message from the guest. +# Return the hv-balloon driver data contained in the last received +# "STATUS" message from the guest. # # Errors: # - If no hv-balloon device is present, guest memory status @@ -1273,8 +1242,7 @@ ## # @MemoryInfo: -# -# Actual memory information in bytes. +# Actual memory information in bytes. # # @base-memory: size of "base" memory specified with command line # option -m. @@ -1307,8 +1275,7 @@ ## # @PCDIMMDeviceInfo: -# -# PCDIMMDevice state information +# PCDIMMDevice state information # # @id: device's ID # @@ -1343,8 +1310,7 @@ ## # @VirtioPMEMDeviceInfo: -# -# VirtioPMEM state information +# VirtioPMEM state information # # @id: device's ID # @@ -1366,8 +1332,7 @@ ## # @VirtioMEMDeviceInfo: -# -# VirtioMEMDevice state information +# VirtioMEMDevice state information # # @id: device's ID # @@ -1401,8 +1366,7 @@ ## # @SgxEPCDeviceInfo: -# -# Sgx EPC state information +# Sgx EPC state information # # @id: device's ID # @@ -1427,8 +1391,7 @@ ## # @HvBalloonDeviceInfo: -# -# hv-balloon provided memory state information +# hv-balloon provided memory state information # # @id: device's ID # @@ -1557,8 +1520,7 @@ ## # @MemoryDeviceInfo: -# -# Union containing information about a memory device +# Union containing information about a memory device # # @type: memory device type # @@ -1579,8 +1541,7 @@ ## # @SgxEPC: -# -# Sgx EPC cmdline information +# Sgx EPC cmdline information # # @memdev: memory backend linked with device # @@ -1596,8 +1557,7 @@ ## # @SgxEPCProperties: -# -# SGX properties of machine types. +# SGX properties of machine types. # # @sgx-epc: list of ids of memory-backend-epc objects. # @@ -1609,8 +1569,7 @@ ## # @query-memory-devices: -# -# Lists available memory devices and their state +# Lists available memory devices and their state # # Since: 2.1 # @@ -1660,8 +1619,7 @@ ## # @BootConfiguration: -# -# Schema for virtual machine boot configuration. +# Schema for virtual machine boot configuration. # # @order: Boot order (a=floppy, c=hard disk, d=CD-ROM, n=network) # @@ -1745,8 +1703,7 @@ ## # @x-query-irq: -# -# Query interrupt statistics +# Query interrupt statistics # # Features: # @@ -1762,8 +1719,7 @@ ## # @x-query-jit: -# -# Query TCG compiler statistics +# Query TCG compiler statistics # # Features: # @@ -1780,8 +1736,7 @@ ## # @x-query-numa: -# -# Query NUMA topology information +# Query NUMA topology information # # Features: # @@ -1797,8 +1752,7 @@ ## # @x-query-ramblock: -# -# Query system ramblock information +# Query system ramblock information # # Features: # @@ -1814,8 +1768,7 @@ ## # @x-query-roms: -# -# Query information on the registered ROMS +# Query information on the registered ROMS # # Features: # @@ -1831,8 +1784,7 @@ ## # @x-query-usb: -# -# Query information on the USB devices +# Query information on the USB devices # # Features: # @@ -1863,8 +1815,7 @@ ## # @MemorySizeConfiguration: -# -# Schema for memory size configuration. +# Schema for memory size configuration. # # @size: memory size in bytes # @@ -1881,8 +1832,7 @@ ## # @dumpdtb: -# -# Save the FDT in dtb format. +# Save the FDT in dtb format. # # @filename: name of the dtb file to be created # @@ -1900,8 +1850,7 @@ ## # @x-query-interrupt-controllers: -# -# Query information on interrupt controller devices +# Query information on interrupt controller devices # # Features: # @@ -1931,8 +1880,7 @@ ## # @query-firmware-log: -# -# Find firmware memory log buffer in guest memory, return content. +# Find firmware memory log buffer in guest memory, return content. # # @max-size: limit the amount of log data returned. Up to 1 MiB of # log data is allowed. In case the amount of log data is larger @@ -1946,8 +1894,7 @@ ## # @dump-skeys: -# -# Dump the storage keys for an s390x guest +# Dump the storage keys for an s390x guest # # @filename: the path to the file to dump to # @@ -1985,8 +1932,7 @@ ## # @CpuModelExpansionType: -# -# An enumeration of CPU model expansion types. +# 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 @@ -2043,8 +1989,7 @@ ## # @CpuModelBaselineInfo: -# -# The result of a CPU model baseline. +# The result of a CPU model baseline. # # @model: the baselined `CpuModelInfo`. # @@ -2055,8 +2000,7 @@ ## # @CpuModelCompareInfo: -# -# The result of a CPU model comparison. +# The result of a CPU model comparison. # # @result: The result of the compare operation. # @@ -2187,8 +2131,7 @@ ## # @CpuModelExpansionInfo: -# -# The result of a cpu model expansion. +# The result of a cpu model expansion. # # @model: the expanded `CpuModelInfo`. # @@ -2257,8 +2200,7 @@ ## # @CpuDefinitionInfo: -# -# Virtual CPU definition. +# Virtual CPU definition. # # @name: the name of the CPU definition # @@ -2319,8 +2261,7 @@ ## # @query-cpu-definitions: -# -# Return a list of supported virtual CPU definitions +# Return a list of supported virtual CPU definitions # # Since: 1.2 ## -- 2.55.0
