qapi: Normalize version references x.y.0 to just x.y
PATCH 1/1 qapi: Normalize version references x.y.0 to just x.y
We use x.y most of the time, and x.y.0 sometimes. Normalize for consistency.
Reported-by Eduardo Habkost <[email protected]>
Signed-off-by Markus Armbruster <[email protected]>
--- qapi/block-core.json | 28 ++++++++++++------------ qapi/block-export.json | 6 +++--- qapi/block.json | 2 +- qapi/char.json | 4 ++-- qapi/control.json | 14 ++++++------ qapi/machine-target.json | 22 +++++++++---------- qapi/machine.json | 46 ++++++++++++++++++++-------------------- qapi/migration.json | 16 +++++++------- qapi/misc-target.json | 2 +- qapi/misc.json | 30 +++++++++++++------------- qapi/net.json | 6 +++--- qapi/pci.json | 12 +++++------ qapi/qdev.json | 2 +- qapi/run-state.json | 16 +++++++------- qapi/ui.json | 40 +++++++++++++++++----------------- 15 files changed, 123 insertions(+), 123 deletions(-)
qapi/block-core.json +14 -14
@@ -302,7 +302,7 @@ # @ro: true if the backing device was open read-only # # @drv: the name of the block format used to open the backing device. As of -# 0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', +# 0.14 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', # 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', # 'http', 'https', 'luks', 'nbd', 'parallels', 'qcow', # 'qcow2', 'raw', 'vdi', 'vmdk', 'vpc', 'vvfat'
@@ -389,7 +389,7 @@ # @deprecated: Member @encryption_key_missing is deprecated. It is # always false. # -# Since: 0.14.0 +# Since: 0.14 # ## { 'struct': 'BlockDeviceInfo',
@@ -607,7 +607,7 @@ # @deprecated: Member @dirty-bitmaps is deprecated. Use @inserted # member @dirty-bitmaps instead. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'BlockInfo', 'data': {'device': 'str', '*qdev': 'str', 'type': 'str', 'removable': 'bool',
@@ -655,7 +655,7 @@ # Returns: a list of @BlockInfo describing each virtual block device. Filter # nodes that were created implicitly are skipped over. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -812,17 +812,17 @@ # @wr_operations: The number of write operations performed by the device. # # @flush_operations: The number of cache flush operations performed by the -# device (since 0.15.0) +# device (since 0.15) # # @unmap_operations: The number of unmap operations performed by the device # (Since 4.2) # -# @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15.0). +# @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15). # -# @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15.0). +# @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15). # # @flush_total_time_ns: Total time spent on cache flushes in nanoseconds -# (since 0.15.0). +# (since 0.15). # # @unmap_total_time_ns: Total time spent on unmap operations in nanoseconds # (Since 4.2)
@@ -884,7 +884,7 @@ # # @flush_latency_histogram: @BlockLatencyHistogramInfo. (Since 4.0) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'BlockDeviceStats', 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'unmap_bytes' : 'int',
@@ -987,7 +987,7 @@ # @backing: This describes the backing block device if it has one. # (Since 2.0) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'BlockStats', 'data': {'*device': 'str', '*qdev': 'str', '*node-name': 'str',
@@ -1011,7 +1011,7 @@ # # Returns: A list of @BlockStats for each virtual block devices. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -1299,7 +1299,7 @@ # Returns: - nothing on success # - If @device is not a valid block device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -1484,7 +1484,7 @@ # Returns: - nothing on success # - If @device is not a valid block device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -4852,7 +4852,7 @@ # Note: If action is "stop", a STOP event will eventually follow the # BLOCK_IO_ERROR event # -# Since: 0.13.0 +# Since: 0.13 # # Example: #
qapi/block-export.json +3 -3
@@ -54,7 +54,7 @@ # # Returns: error if the server is already running. # -# Since: 1.3.0 +# Since: 1.3 ## { 'command': 'nbd-server-start', 'data': { 'addr': 'SocketAddressLegacy',
@@ -155,7 +155,7 @@ # Returns: error if the server is not running, or export with the same name # already exists. # -# Since: 1.3.0 +# Since: 1.3 ## { 'command': 'nbd-server-add', 'data': 'NbdServerAddOptions', 'boxed': true, 'features': ['deprecated'] }
@@ -211,7 +211,7 @@ # Stop QEMU's embedded NBD server, and unregister all devices previously # added via @nbd-server-add. # -# Since: 1.3.0 +# Since: 1.3 ## { 'command': 'nbd-server-stop' }
qapi/block.json +1 -1
@@ -107,7 +107,7 @@ # - If @device is not a valid block device, DeviceNotFound # Notes: Ejecting a device with no media results in success # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
qapi/char.json +2 -2
@@ -24,7 +24,7 @@ # Notes: @filename is encoded using the QEMU command line character device # encoding. See the QEMU man page for details. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'ChardevInfo', 'data': { 'label': 'str',
@@ -38,7 +38,7 @@ # # Returns: a list of @ChardevInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
qapi/control.json +7 -7
@@ -87,7 +87,7 @@ # exact format depends on the downstream however it highly # recommended that a unique name is used. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'VersionInfo', 'data': {'qemu': 'VersionTriple', 'package': 'str'} }
@@ -99,7 +99,7 @@ # # Returns: A @VersionInfo object describing the current version of QEMU. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -126,7 +126,7 @@ # # @name: The command name # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'CommandInfo', 'data': {'name': 'str'} }
@@ -137,7 +137,7 @@ # # Returns: A list of @CommandInfo for all supported commands # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -166,7 +166,7 @@ # # @name: The event name # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'EventInfo', 'data': {'name': 'str'} }
@@ -182,7 +182,7 @@ # # Returns: A list of @EventInfo. # -# Since: 1.2.0 +# Since: 1.2 # # Example: #
@@ -212,7 +212,7 @@ # guaranteed. When using this interface, a premature EOF would not be # unexpected. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
qapi/machine-target.json +11 -11
@@ -17,7 +17,7 @@ # @name: the name of the CPU definition the model is based on # @props: a dictionary of QOM properties to be applied # -# Since: 2.8.0 +# Since: 2.8 ## { 'struct': 'CpuModelInfo', 'data': { 'name': 'str',
@@ -49,7 +49,7 @@ # version or machine-type, use @static (but keep in mind that some features may # be omitted). # -# Since: 2.8.0 +# Since: 2.8 ## { 'enum': 'CpuModelExpansionType', 'data': [ 'static', 'full' ] }
@@ -73,7 +73,7 @@ # @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.0 +# Since: 2.8 ## { 'enum': 'CpuModelCompareResult', 'data': [ 'incompatible', 'identical', 'superset', 'subset' ] }
@@ -85,7 +85,7 @@ # # @model: the baselined CpuModelInfo. # -# Since: 2.8.0 +# Since: 2.8 ## { 'struct': 'CpuModelBaselineInfo', 'data': { 'model': 'CpuModelInfo' },
@@ -107,7 +107,7 @@ # 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.0 +# Since: 2.8 ## { 'struct': 'CpuModelCompareInfo', 'data': { 'result': 'CpuModelCompareResult',
@@ -151,7 +151,7 @@ # Note: this command isn't specific to s390x, but is only implemented # on this architecture currently. # -# Since: 2.8.0 +# Since: 2.8 ## { 'command': 'query-cpu-model-comparison', 'data': { 'modela': 'CpuModelInfo', 'modelb': 'CpuModelInfo' },
@@ -194,7 +194,7 @@ # Note: this command isn't specific to s390x, but is only implemented # on this architecture currently. # -# Since: 2.8.0 +# Since: 2.8 ## { 'command': 'query-cpu-model-baseline', 'data': { 'modela': 'CpuModelInfo',
@@ -209,7 +209,7 @@ # # @model: the expanded CpuModelInfo. # -# Since: 2.8.0 +# Since: 2.8 ## { 'struct': 'CpuModelExpansionInfo', 'data': { 'model': 'CpuModelInfo' },
@@ -246,7 +246,7 @@ # with a wrong type. Also returns an error if an expansion type is # not supported. # -# Since: 2.8.0 +# Since: 2.8 ## { 'command': 'query-cpu-model-expansion', 'data': { 'type': 'CpuModelExpansionType',
@@ -306,7 +306,7 @@ # If @unavailable-features is not present, runnability # information for the CPU is not available. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'CpuDefinitionInfo', 'data': { 'name': 'str',
@@ -325,7 +325,7 @@ # # Returns: a list of CpuDefInfo # -# Since: 1.2.0 +# Since: 1.2 ## { 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'], 'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X) || defined(TARGET_MIPS)' }
qapi/machine.json +23 -23
179 lines not on this page · raw message
qapi/migration.json +8 -8
@@ -46,7 +46,7 @@ # @pages-per-second: the number of memory pages transferred per second # (Since 4.0) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' ,
@@ -224,7 +224,7 @@ # only returned if VFIO device is present, migration is supported by all # VFIO devices and status is 'active' or 'completed' (since 5.2) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'MigrationInfo', 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationStats',
@@ -252,7 +252,7 @@ # # Returns: @MigrationInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -1143,7 +1143,7 @@ # @tls-port: spice tcp port for tls-secured channels # @cert-subject: server certificate subject # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -1343,7 +1343,7 @@ # # Notes: This command succeeds even if there is no migration process running. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -1383,7 +1383,7 @@ # # Returns: nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -1407,7 +1407,7 @@ # # Returns: nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -1486,7 +1486,7 @@ # # Returns: nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Notes: #
qapi/misc-target.json +1 -1
@@ -12,7 +12,7 @@ # # Note: This event is rate-limited. # -# Since: 0.13.0 +# Since: 0.13 # # Example: #
qapi/misc.json +15 -15
@@ -27,7 +27,7 @@ # # Returns: nothing on success. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -47,7 +47,7 @@ # # @name: The name of the guest # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'NameInfo', 'data': {'*name': 'str'} }
@@ -58,7 +58,7 @@ # # Returns: @NameInfo of the guest # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -132,7 +132,7 @@ # # Stop all guest VCPU execution. # -# Since: 0.14.0 +# Since: 0.14 # # Notes: This function will succeed even if the guest is already in the stopped # state. In "inmigrate" state, it will ensure that the guest
@@ -152,7 +152,7 @@ # # Resume guest VCPU execution. # -# Since: 0.14.0 +# Since: 0.14 # # Returns: If successful, nothing #
@@ -210,7 +210,7 @@ # # Returns: the output of the command as a string # -# Since: 0.14.0 +# Since: 0.14 # # Notes: This command only exists as a stop-gap. Its use is highly # discouraged. The semantics of this command are not
@@ -264,7 +264,7 @@ # Returns: - Nothing on success. # - If @device is not a valid block device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -296,7 +296,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Notes: If @fdname already exists, the file descriptor assigned to # it will be closed and replaced by the received file
@@ -322,7 +322,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -342,7 +342,7 @@ # @fd: The file descriptor that was received via SCM rights and # added to the fd set. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'AddfdInfo', 'data': {'fdset-id': 'int', 'fd': 'int'} }
@@ -363,7 +363,7 @@ # # If @fdset-id is not specified, a new fd set will be created. # -# Since: 1.2.0 +# Since: 1.2 # # Example: #
@@ -388,7 +388,7 @@ # Returns: - Nothing on success # - If @fdset-id or @fd is not found, FdNotFound # -# Since: 1.2.0 +# Since: 1.2 # # Notes: The list of fd sets is shared by all monitor connections. #
@@ -412,7 +412,7 @@ # # @opaque: A free-form string that can be used to describe the fd. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'FdsetFdInfo', 'data': {'fd': 'int', '*opaque': 'str'} }
@@ -426,7 +426,7 @@ # # @fds: A list of file descriptors that belong to this fd set. # -# Since: 1.2.0 +# Since: 1.2 ## { 'struct': 'FdsetInfo', 'data': {'fdset-id': 'int', 'fds': ['FdsetFdInfo']} }
@@ -438,7 +438,7 @@ # # Returns: A list of @FdsetInfo # -# Since: 1.2.0 +# Since: 1.2 # # Note: The list of fd sets is shared by all monitor connections. #
qapi/net.json +3 -3
@@ -20,7 +20,7 @@ # Returns: Nothing on success # If @name is not a valid network device, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Notes: Not all network adapters support setting link status. This command # will succeed even if the network adapter does not support link status
@@ -42,7 +42,7 @@ # # Additional arguments depend on the type. # -# Since: 0.14.0 +# Since: 0.14 # # Returns: Nothing on success # If @type is not a valid network backend, DeviceNotFound
@@ -67,7 +67,7 @@ # Returns: Nothing on success # If @id is not a valid network backend, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
qapi/pci.json +6 -6
@@ -18,7 +18,7 @@ # # @limit: the ending address (guest physical) # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciMemoryRange', 'data': {'base': 'int', 'limit': 'int'} }
@@ -38,7 +38,7 @@ # # @mem_type_64: if @type is 'memory', true if the BAR is 64-bit # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciMemoryRegion', 'data': {'bar': 'int', 'type': 'str', 'address': 'int', 'size': 'int',
@@ -82,7 +82,7 @@ # # @devices: a list of @PciDeviceInfo for each device on this bridge # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciBridgeInfo', 'data': {'bus': 'PciBusInfo', '*devices': ['PciDeviceInfo']} }
@@ -148,7 +148,7 @@ # Notes: the contents of @class_info.desc are not stable and should only be # treated as informational. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciDeviceInfo', 'data': {'bus': 'int', 'slot': 'int', 'function': 'int',
@@ -165,7 +165,7 @@ # # @devices: a list of devices on this bus # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'PciInfo', 'data': {'bus': 'int', 'devices': ['PciDeviceInfo']} }
@@ -179,7 +179,7 @@ # all PCI devices attached to it. Each device is represented by a # json-object. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
qapi/qdev.json +1 -1
@@ -86,7 +86,7 @@ # DEVICE_DELETED event. Guest reset will automatically complete removal # for all devices. # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
qapi/run-state.json +8 -8
@@ -107,7 +107,7 @@ # # @status: the virtual machine @RunState # -# Since: 0.14.0 +# Since: 0.14 # # Notes: @singlestep is enabled through the GDB stub ##
@@ -121,7 +121,7 @@ # # Returns: @StatusInfo reflecting all VCPUs # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -149,7 +149,7 @@ # Note: If the command-line option "-no-shutdown" has been specified, qemu will # not exit, and a STOP event will eventually follow the SHUTDOWN event # -# Since: 0.12.0 +# Since: 0.12 # # Example: #
@@ -165,7 +165,7 @@ # Emitted when the virtual machine is powered down through the power control # system, such as via ACPI. # -# Since: 0.12.0 +# Since: 0.12 # # Example: #
@@ -187,7 +187,7 @@ # # @reason: The @ShutdownCause of the RESET. (since 4.0) # -# Since: 0.12.0 +# Since: 0.12 # # Example: #
@@ -202,7 +202,7 @@ # # Emitted when the virtual machine is stopped # -# Since: 0.12.0 +# Since: 0.12 # # Example: #
@@ -217,7 +217,7 @@ # # Emitted when the virtual machine resumes execution # -# Since: 0.12.0 +# Since: 0.12 # # Example: #
@@ -288,7 +288,7 @@ # # Note: This event is rate-limited. # -# Since: 0.13.0 +# Since: 0.13 # # Example: #
qapi/ui.json +20 -20
@@ -27,7 +27,7 @@ # Returns: - Nothing on success # - If Spice is not enabled, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -56,7 +56,7 @@ # Returns: - Nothing on success # - If @protocol is 'spice' and Spice is not active, DeviceNotFound # -# Since: 0.14.0 +# Since: 0.14 # # Notes: Time is relative to the server and currently there is no way to # coordinate server time with client time. It is not recommended to
@@ -88,7 +88,7 @@ # # Returns: Nothing on success # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -156,7 +156,7 @@ # # @tls: true if the channel is encrypted, false otherwise. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'SpiceChannel', 'base': 'SpiceBasicInfo',
@@ -215,7 +215,7 @@ # # @channels: a list of @SpiceChannel for each active spice channel # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'SpiceInfo', 'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port': 'int',
@@ -230,7 +230,7 @@ # # Returns: @SpiceInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -278,7 +278,7 @@ # # @client: client information # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -305,7 +305,7 @@ # # @client: client information # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -333,7 +333,7 @@ # # @client: client information # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -420,7 +420,7 @@ # @sasl_username: If SASL authentication is in use, the SASL username # used for authentication. # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'VncClientInfo', 'base': 'VncBasicInfo',
@@ -462,7 +462,7 @@ # # @clients: a list of @VncClientInfo of all currently connected clients # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'VncInfo', 'data': {'enabled': 'bool', '*host': 'str',
@@ -555,7 +555,7 @@ # # Returns: @VncInfo # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -619,7 +619,7 @@ # Note: This event is emitted before any authentication takes place, thus # the authentication ID is not provided # -# Since: 0.13.0 +# Since: 0.13 # # Example: #
@@ -647,7 +647,7 @@ # # @client: client information # -# Since: 0.13.0 +# Since: 0.13 # # Example: #
@@ -674,7 +674,7 @@ # # @client: client information # -# Since: 0.13.0 +# Since: 0.13 # # Example: #
@@ -709,7 +709,7 @@ # # @absolute: true if this device supports absolute coordinates as input # -# Since: 0.14.0 +# Since: 0.14 ## { 'struct': 'MouseInfo', 'data': {'name': 'str', 'index': 'int', 'current': 'bool',
@@ -722,7 +722,7 @@ # # Returns: a list of @MouseInfo for each device # -# Since: 0.14.0 +# Since: 0.14 # # Example: #
@@ -792,7 +792,7 @@ # 'sysrq' will be transparently changed to 'print', so they # are effectively synonyms. # -# Since: 1.3.0 +# Since: 1.3 # ## { 'enum': 'QKeyCode',
@@ -824,7 +824,7 @@ # # Represents a keyboard key. # -# Since: 1.3.0 +# Since: 1.3 ## { 'union': 'KeyValue', 'data': {
@@ -847,7 +847,7 @@ # Returns: - Nothing on success # - If key is unknown or redundant, InvalidParameter # -# Since: 1.3.0 +# Since: 1.3 # # Example: #
Signature · 1 line
2.26.2
Quoted 6 lines · Markus Armbruster
We use x.y most of the time, and x.y.0 sometimes. Normalize for consistency.
Reported-by Eduardo Habkost <[email protected]>Signed-off-by Markus Armbruster <[email protected]>---
Documentation-only, therefore safe for -rc3, but also not the end of the world if it slips into 6.0.
Reviewed-by Eric Blake <[email protected]>
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org