SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

QAPI patches patches for 2022-05-16

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmKB4qQSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZT3jEP/R2FnJn5GEARg+tMMSyRL2P5eH4rmA1e
 ZY2+E7XOdA4Ey42HlluvAu5QPf7LOivCeB0o1QQxAgSHBWjbWxkM+6NnHtIQ7RKu
 dx6zenNq55f+6+kygVLUBZqq6bIgB7QT0/6q1fyyvQi0o76loJBk9UgJHxw94GgJ
 yaZIx5mX+LFTUW6WyvCv1tCAmTUOW5umhSchIZcL3YfFxw5ZdSl4sYFY4Gotncu1
 DXNJVDy7FcfC5MOT7HH1LaWJDqRKEM6o+Axk25E7a1FgKy9vRCoI/CwL1ri9eWPG
 dauQQmtgn3krPSU3ZeM4euLT3pYs+WOzQgPLo0XOr0m/chBZXHGZMbcHfTKUgo68
 qA0deECGE/unEKVvfak+A5lsZJ9ubT96CSzEZEB2EOHL4guRzGKeBP2dP2HiKJGI
 O9FhedRPAIoIGV1Ehqz1HVy7jGZN6iI+UkcvTx1MKxGCe+sku3mbCAErGF2zTYI3
 LBrUGVdcCeLuC/oblwWp/igY+E5oPzkkciM4v8PS+S5VN9etUNoJdDdQ7sy5Mrpz
 YzLSXSAIrEss7cQHLPx724GavMxqYRlWhwLKvPJgV8wHH0t8C0DXgD4KP7yWv7BZ
 BZa4efkr4vdO5l1ioTo789K1BC99yKBCgDwdXepD6rSXCwJoGb9CDDvQmYTRhQIH
 6csIF19yqYQG
 =sICK
 -----END PGP SIGNATURE-----

Merge tag 'pull-qapi-2022-05-16' of git://repo.or.cz/qemu/armbru into staging

QAPI patches patches for 2022-05-16

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmKB4qQSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZT3jEP/R2FnJn5GEARg+tMMSyRL2P5eH4rmA1e
# ZY2+E7XOdA4Ey42HlluvAu5QPf7LOivCeB0o1QQxAgSHBWjbWxkM+6NnHtIQ7RKu
# dx6zenNq55f+6+kygVLUBZqq6bIgB7QT0/6q1fyyvQi0o76loJBk9UgJHxw94GgJ
# yaZIx5mX+LFTUW6WyvCv1tCAmTUOW5umhSchIZcL3YfFxw5ZdSl4sYFY4Gotncu1
# DXNJVDy7FcfC5MOT7HH1LaWJDqRKEM6o+Axk25E7a1FgKy9vRCoI/CwL1ri9eWPG
# dauQQmtgn3krPSU3ZeM4euLT3pYs+WOzQgPLo0XOr0m/chBZXHGZMbcHfTKUgo68
# qA0deECGE/unEKVvfak+A5lsZJ9ubT96CSzEZEB2EOHL4guRzGKeBP2dP2HiKJGI
# O9FhedRPAIoIGV1Ehqz1HVy7jGZN6iI+UkcvTx1MKxGCe+sku3mbCAErGF2zTYI3
# LBrUGVdcCeLuC/oblwWp/igY+E5oPzkkciM4v8PS+S5VN9etUNoJdDdQ7sy5Mrpz
# YzLSXSAIrEss7cQHLPx724GavMxqYRlWhwLKvPJgV8wHH0t8C0DXgD4KP7yWv7BZ
# BZa4efkr4vdO5l1ioTo789K1BC99yKBCgDwdXepD6rSXCwJoGb9CDDvQmYTRhQIH
# 6csIF19yqYQG
# =sICK
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 15 May 2022 10:35:32 PM PDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [undefined]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-qapi-2022-05-16' of git://repo.or.cz/qemu/armbru:
  qapi/pragma: Tidy up comments
  docs/devel/qapi-code-gen: Belatedly document feature naming rules
  qapi/expr: Enforce feature naming rules again
  qapi: Stop using whitespace for alignment in comments
  qapi: Drop unnecessary whitespace in comments
  qapi: Drop unnecessary empty lines outside of comments
  qapi: Drop unnecessary empty lines in comments
  qapi: Add missing separators between sections
  qapi: Fix comment indentation
  qapi: Drop stray trailing symbol
  qapi: Fix malformed "Since:" section tags

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-05-16 07:45:55 -07:00
commit b935385c35
23 changed files with 148 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/devel/qapi-code-gen.rst
View File

@ -739,10 +739,11 @@ Type names ending with ``Kind`` or ``List`` are reserved for the
generator, which uses them for implicit union enums and array types, generator, which uses them for implicit union enums and array types,
respectively. respectively.
Command names, and member names within a type, should be all lower Command names, member names within a type, and feature names should be
case with words separated by a hyphen. However, some existing older all lower case with words separated by a hyphen. However, some
commands and complex types use underscore; when extending them, existing older commands and complex types use underscore; when
consistency is preferred over blindly avoiding underscore. extending them, consistency is preferred over blindly avoiding
underscore.
Event names should be ALL_CAPS with words separated by underscore. Event names should be ALL_CAPS with words separated by underscore.

1
qapi/audio.json
View File

@ -352,7 +352,6 @@
'*out': 'AudiodevPerDirectionOptions', '*out': 'AudiodevPerDirectionOptions',
'*path': 'str' } } '*path': 'str' } }
## ##
# @AudioFormat: # @AudioFormat:
# #

23
qapi/block-core.json
View File

@ -237,7 +237,6 @@
# information (since 1.7) # information (since 1.7)
# #
# Since: 1.3 # Since: 1.3
#
## ##
{ 'struct': 'ImageInfo', { 'struct': 'ImageInfo',
'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool', 'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool',
@ -288,7 +287,6 @@
# supports it # supports it
# #
# Since: 1.4 # Since: 1.4
#
## ##
{ 'struct': 'ImageCheck', { 'struct': 'ImageCheck',
'data': {'filename': 'str', 'format': 'str', 'check-errors': 'int', 'data': {'filename': 'str', 'format': 'str', 'check-errors': 'int',
@ -328,7 +326,6 @@
# @filename: filename that is referred to by @offset # @filename: filename that is referred to by @offset
# #
# Since: 2.6 # Since: 2.6
#
## ##
{ 'struct': 'MapEntry', { 'struct': 'MapEntry',
'data': {'start': 'int', 'length': 'int', 'data': 'bool', 'data': {'start': 'int', 'length': 'int', 'data': 'bool',
@ -445,7 +442,6 @@
# has one or more dirty bitmaps) (Since 4.2) # has one or more dirty bitmaps) (Since 4.2)
# #
# Since: 0.14 # Since: 0.14
#
## ##
{ 'struct': 'BlockDeviceInfo', { 'struct': 'BlockDeviceInfo',
'data': { 'file': 'str', '*node-name': 'str', 'ro': 'bool', 'drv': 'str', 'data': { 'file': 'str', '*node-name': 'str', 'ro': 'bool', 'drv': 'str',
@ -743,7 +739,6 @@
## ##
{ 'command': 'query-block', 'returns': ['BlockInfo'] } { 'command': 'query-block', 'returns': ['BlockInfo'] }
## ##
# @BlockDeviceTimedStats: # @BlockDeviceTimedStats:
# #
@ -1516,7 +1511,6 @@
{ 'command': 'blockdev-snapshot-sync', { 'command': 'blockdev-snapshot-sync',
'data': 'BlockdevSnapshotSync' } 'data': 'BlockdevSnapshotSync' }
## ##
# @blockdev-snapshot: # @blockdev-snapshot:
# #
@ -1744,6 +1738,7 @@
# Since: 2.3 # Since: 2.3
# #
# Example: # Example:
#
# -> { "execute": "blockdev-backup", # -> { "execute": "blockdev-backup",
# "arguments": { "device": "src-id", # "arguments": { "device": "src-id",
# "sync": "full", # "sync": "full",
@ -1754,7 +1749,6 @@
{ 'command': 'blockdev-backup', 'boxed': true, { 'command': 'blockdev-backup', 'boxed': true,
'data': 'BlockdevBackup' } 'data': 'BlockdevBackup' }
## ##
# @query-named-block-nodes: # @query-named-block-nodes:
# #
@ -2008,6 +2002,7 @@
# @on-target-error: the action to take on an error on the target, # @on-target-error: the action to take on an error on the target,
# default 'report' (no limitations, since this applies to # default 'report' (no limitations, since this applies to
# a different block device than @device). # a different block device than @device).
#
# @unmap: Whether to try to unmap target sectors where source has # @unmap: Whether to try to unmap target sectors where source has
# only zero. If true, and target unallocated sectors will read as zero, # only zero. If true, and target unallocated sectors will read as zero,
# target image sectors will be unmapped; otherwise, zeroes will be # target image sectors will be unmapped; otherwise, zeroes will be
@ -2029,6 +2024,7 @@
# When true, this job will automatically disappear from the query # When true, this job will automatically disappear from the query
# list without user intervention. # list without user intervention.
# Defaults to true. (Since 3.1) # Defaults to true. (Since 3.1)
#
# Since: 1.3 # Since: 1.3
## ##
{ 'struct': 'DriveMirror', { 'struct': 'DriveMirror',
@ -2342,6 +2338,7 @@
# When true, this job will automatically disappear from the query # When true, this job will automatically disappear from the query
# list without user intervention. # list without user intervention.
# Defaults to true. (Since 3.1) # Defaults to true. (Since 3.1)
#
# Returns: nothing on success. # Returns: nothing on success.
# #
# Since: 2.6 # Since: 2.6
@ -3067,7 +3064,6 @@
'base': 'BlockdevOptionsGenericFormat', 'base': 'BlockdevOptionsGenericFormat',
'data': { '*key-secret': 'str' } } 'data': { '*key-secret': 'str' } }
## ##
# @BlockdevOptionsGenericCOWFormat: # @BlockdevOptionsGenericCOWFormat:
# #
@ -3182,8 +3178,6 @@
'base': 'BlockdevOptionsGenericCOWFormat', 'base': 'BlockdevOptionsGenericCOWFormat',
'data': { '*encrypt': 'BlockdevQcowEncryption' } } 'data': { '*encrypt': 'BlockdevQcowEncryption' } }
## ##
# @BlockdevQcow2EncryptionFormat: # @BlockdevQcow2EncryptionFormat:
# #
@ -3343,8 +3337,7 @@
# #
# @path: path to the image on the host # @path: path to the image on the host
# #
# @user: user as which to connect, defaults to current # @user: user as which to connect, defaults to current local user name
# local user name
# #
# @host-key-check: Defines how and what to check the host key against # @host-key-check: Defines how and what to check the host key against
# (default: known_hosts) # (default: known_hosts)
@ -3357,7 +3350,6 @@
'*user': 'str', '*user': 'str',
'*host-key-check': 'SshHostKeyCheck' } } '*host-key-check': 'SshHostKeyCheck' } }
## ##
# @BlkdebugEvent: # @BlkdebugEvent:
# #
@ -3721,7 +3713,6 @@
'*header-digest': 'IscsiHeaderDigest', '*header-digest': 'IscsiHeaderDigest',
'*timeout': 'int' } } '*timeout': 'int' } }
## ##
# @RbdAuthMode: # @RbdAuthMode:
# #
@ -4139,6 +4130,7 @@
# @throttle-group: the name of the throttle-group object to use. It # @throttle-group: the name of the throttle-group object to use. It
# must already exist. # must already exist.
# @file: reference to or definition of the data source block device # @file: reference to or definition of the data source block device
#
# Since: 2.11 # Since: 2.11
## ##
{ 'struct': 'BlockdevOptionsThrottle', { 'struct': 'BlockdevOptionsThrottle',
@ -4563,7 +4555,6 @@
{ 'enum': 'BlockdevQcow2Version', { 'enum': 'BlockdevQcow2Version',
'data': [ 'v2', 'v3' ] } 'data': [ 'v2', 'v3' ] }
## ##
# @Qcow2CompressionType: # @Qcow2CompressionType:
# #
@ -4737,7 +4728,6 @@
'*toolsversion': 'str', '*toolsversion': 'str',
'*zeroed-grain': 'bool' } } '*zeroed-grain': 'bool' } }
## ##
# @BlockdevCreateOptionsSsh: # @BlockdevCreateOptionsSsh:
# #
@ -4972,7 +4962,6 @@
{ 'enum': 'BlockErrorAction', { 'enum': 'BlockErrorAction',
'data': [ 'ignore', 'report', 'stop' ] } 'data': [ 'ignore', 'report', 'stop' ] }
## ##
# @BLOCK_IMAGE_CORRUPTED: # @BLOCK_IMAGE_CORRUPTED:
# #

5
qapi/block.json
View File

@ -105,6 +105,7 @@
# #
# Returns: - Nothing on success # Returns: - Nothing on success
# - If @device is not a valid block device, DeviceNotFound # - If @device is not a valid block device, DeviceNotFound
#
# Notes: Ejecting a device with no media results in success # Notes: Ejecting a device with no media results in success
# #
# Since: 0.14 # Since: 0.14
@ -285,7 +286,6 @@
'data': { 'id': 'str', 'data': { 'id': 'str',
'node-name': 'str'} } 'node-name': 'str'} }
## ##
# @BlockdevChangeReadOnlyMode: # @BlockdevChangeReadOnlyMode:
# #
@ -299,12 +299,10 @@
# @read-write: Makes the device writable # @read-write: Makes the device writable
# #
# Since: 2.3 # Since: 2.3
#
## ##
{ 'enum': 'BlockdevChangeReadOnlyMode', { 'enum': 'BlockdevChangeReadOnlyMode',
'data': ['retain', 'read-only', 'read-write'] } 'data': ['retain', 'read-only', 'read-write'] }
## ##
# @blockdev-change-medium: # @blockdev-change-medium:
# #
@ -375,7 +373,6 @@
'*force': 'bool', '*force': 'bool',
'*read-only-mode': 'BlockdevChangeReadOnlyMode' } } '*read-only-mode': 'BlockdevChangeReadOnlyMode' } }
## ##
# @DEVICE_TRAY_MOVED: # @DEVICE_TRAY_MOVED:
# #

2
qapi/char.json
View File

@ -329,7 +329,6 @@
'data': { '*signal': 'bool' }, 'data': { '*signal': 'bool' },
'base': 'ChardevCommon' } 'base': 'ChardevCommon' }
## ##
# @ChardevSpiceChannel: # @ChardevSpiceChannel:
# #
@ -413,7 +412,6 @@
# @clipboard: enable/disable clipboard, default is disabled. # @clipboard: enable/disable clipboard, default is disabled.
# #
# Since: 6.1 # Since: 6.1
#
## ##
{ 'struct': 'ChardevQemuVDAgent', { 'struct': 'ChardevQemuVDAgent',
'data': { '*mouse': 'bool', 'data': { '*mouse': 'bool',

2
qapi/common.json
View File

@ -192,7 +192,6 @@
# Keys to toggle input-linux between host and guest. # Keys to toggle input-linux between host and guest.
# #
# Since: 4.0 # Since: 4.0
#
## ##
{ 'enum': 'GrabToggleKeys', { 'enum': 'GrabToggleKeys',
'data': [ 'ctrl-ctrl', 'alt-alt', 'shift-shift','meta-meta', 'scrolllock', 'data': [ 'ctrl-ctrl', 'alt-alt', 'shift-shift','meta-meta', 'scrolllock',
@ -204,7 +203,6 @@
# @human-readable-text: Formatted output intended for humans. # @human-readable-text: Formatted output intended for humans.
# #
# Since: 6.2 # Since: 6.2
#
## ##
{ 'struct': 'HumanReadableText', { 'struct': 'HumanReadableText',
'data': { 'human-readable-text': 'str' } } 'data': { 'human-readable-text': 'str' } }

3
qapi/control.json
View File

@ -33,7 +33,6 @@
# all the QMP capabilities will be turned off by default. # all the QMP capabilities will be turned off by default.
# #
# Since: 0.13 # Since: 0.13
#
## ##
{ 'command': 'qmp_capabilities', { 'command': 'qmp_capabilities',
'data': { '*enable': [ 'QMPCapability' ] }, 'data': { '*enable': [ 'QMPCapability' ] },
@ -49,7 +48,6 @@
# (Please refer to qmp-spec.txt for more information on OOB) # (Please refer to qmp-spec.txt for more information on OOB)
# #
# Since: 2.12 # Since: 2.12
#
## ##
{ 'enum': 'QMPCapability', { 'enum': 'QMPCapability',
'data': [ 'oob' ] } 'data': [ 'oob' ] }
@ -70,7 +68,6 @@
{ 'struct': 'VersionTriple', { 'struct': 'VersionTriple',
'data': {'major': 'int', 'minor': 'int', 'micro': 'int'} } 'data': {'major': 'int', 'minor': 'int', 'micro': 'int'} }
## ##
# @VersionInfo: # @VersionInfo:
# #

22
qapi/crypto.json
View File

@ -24,7 +24,6 @@
'prefix': 'QCRYPTO_TLS_CREDS_ENDPOINT', 'prefix': 'QCRYPTO_TLS_CREDS_ENDPOINT',
'data': ['client', 'server']} 'data': ['client', 'server']}
## ##
# @QCryptoSecretFormat: # @QCryptoSecretFormat:
# #
@ -32,13 +31,13 @@
# #
# @raw: raw bytes. When encoded in JSON only valid UTF-8 sequences can be used # @raw: raw bytes. When encoded in JSON only valid UTF-8 sequences can be used
# @base64: arbitrary base64 encoded binary data # @base64: arbitrary base64 encoded binary data
#
# Since: 2.6 # Since: 2.6
## ##
{ 'enum': 'QCryptoSecretFormat', { 'enum': 'QCryptoSecretFormat',
'prefix': 'QCRYPTO_SECRET_FORMAT', 'prefix': 'QCRYPTO_SECRET_FORMAT',
'data': ['raw', 'base64']} 'data': ['raw', 'base64']}
## ##
# @QCryptoHashAlgorithm: # @QCryptoHashAlgorithm:
# #
@ -51,13 +50,13 @@
# @sha384: SHA-384. (since 2.7) # @sha384: SHA-384. (since 2.7)
# @sha512: SHA-512. (since 2.7) # @sha512: SHA-512. (since 2.7)
# @ripemd160: RIPEMD-160. (since 2.7) # @ripemd160: RIPEMD-160. (since 2.7)
#
# Since: 2.6 # Since: 2.6
## ##
{ 'enum': 'QCryptoHashAlgorithm', { 'enum': 'QCryptoHashAlgorithm',
'prefix': 'QCRYPTO_HASH_ALG', 'prefix': 'QCRYPTO_HASH_ALG',
'data': ['md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'ripemd160']} 'data': ['md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'ripemd160']}
## ##
# @QCryptoCipherAlgorithm: # @QCryptoCipherAlgorithm:
# #
@ -75,6 +74,7 @@
# @twofish-128: Twofish with 128 bit / 16 byte keys # @twofish-128: Twofish with 128 bit / 16 byte keys
# @twofish-192: Twofish with 192 bit / 24 byte keys # @twofish-192: Twofish with 192 bit / 24 byte keys
# @twofish-256: Twofish with 256 bit / 32 byte keys # @twofish-256: Twofish with 256 bit / 32 byte keys
#
# Since: 2.6 # Since: 2.6
## ##
{ 'enum': 'QCryptoCipherAlgorithm', { 'enum': 'QCryptoCipherAlgorithm',
@ -85,7 +85,6 @@
'serpent-128', 'serpent-192', 'serpent-256', 'serpent-128', 'serpent-192', 'serpent-256',
'twofish-128', 'twofish-192', 'twofish-256']} 'twofish-128', 'twofish-192', 'twofish-256']}
## ##
# @QCryptoCipherMode: # @QCryptoCipherMode:
# #
@ -95,13 +94,13 @@
# @cbc: Cipher Block Chaining # @cbc: Cipher Block Chaining
# @xts: XEX with tweaked code book and ciphertext stealing # @xts: XEX with tweaked code book and ciphertext stealing
# @ctr: Counter (Since 2.8) # @ctr: Counter (Since 2.8)
#
# Since: 2.6 # Since: 2.6
## ##
{ 'enum': 'QCryptoCipherMode', { 'enum': 'QCryptoCipherMode',
'prefix': 'QCRYPTO_CIPHER_MODE', 'prefix': 'QCRYPTO_CIPHER_MODE',
'data': ['ecb', 'cbc', 'xts', 'ctr']} 'data': ['ecb', 'cbc', 'xts', 'ctr']}
## ##
# @QCryptoIVGenAlgorithm: # @QCryptoIVGenAlgorithm:
# #
@ -114,6 +113,7 @@
# @plain: 64-bit sector number truncated to 32-bits # @plain: 64-bit sector number truncated to 32-bits
# @plain64: 64-bit sector number # @plain64: 64-bit sector number
# @essiv: 64-bit sector number encrypted with a hash of the encryption key # @essiv: 64-bit sector number encrypted with a hash of the encryption key
#
# Since: 2.6 # Since: 2.6
## ##
{ 'enum': 'QCryptoIVGenAlgorithm', { 'enum': 'QCryptoIVGenAlgorithm',
@ -170,12 +170,12 @@
# @key-secret: the ID of a QCryptoSecret object providing the # @key-secret: the ID of a QCryptoSecret object providing the
# decryption key. Mandatory except when probing image for # decryption key. Mandatory except when probing image for
# metadata only. # metadata only.
#
# Since: 2.6 # Since: 2.6
## ##
{ 'struct': 'QCryptoBlockOptionsLUKS', { 'struct': 'QCryptoBlockOptionsLUKS',
'data': { '*key-secret': 'str' }} 'data': { '*key-secret': 'str' }}
## ##
# @QCryptoBlockCreateOptionsLUKS: # @QCryptoBlockCreateOptionsLUKS:
# #
@ -194,6 +194,7 @@
# @iter-time: number of milliseconds to spend in # @iter-time: number of milliseconds to spend in
# PBKDF passphrase processing. Currently defaults # PBKDF passphrase processing. Currently defaults
# to 2000. (since 2.8) # to 2000. (since 2.8)
#
# Since: 2.6 # Since: 2.6
## ##
{ 'struct': 'QCryptoBlockCreateOptionsLUKS', { 'struct': 'QCryptoBlockCreateOptionsLUKS',
@ -205,7 +206,6 @@
'*hash-alg': 'QCryptoHashAlgorithm', '*hash-alg': 'QCryptoHashAlgorithm',
'*iter-time': 'int'}} '*iter-time': 'int'}}
## ##
# @QCryptoBlockOpenOptions: # @QCryptoBlockOpenOptions:
# #
@ -220,7 +220,6 @@
'data': { 'qcow': 'QCryptoBlockOptionsQCow', 'data': { 'qcow': 'QCryptoBlockOptionsQCow',
'luks': 'QCryptoBlockOptionsLUKS' } } 'luks': 'QCryptoBlockOptionsLUKS' } }
## ##
# @QCryptoBlockCreateOptions: # @QCryptoBlockCreateOptions:
# #
@ -235,7 +234,6 @@
'data': { 'qcow': 'QCryptoBlockOptionsQCow', 'data': { 'qcow': 'QCryptoBlockOptionsQCow',
'luks': 'QCryptoBlockCreateOptionsLUKS' } } 'luks': 'QCryptoBlockCreateOptionsLUKS' } }
## ##
# @QCryptoBlockInfoBase: # @QCryptoBlockInfoBase:
# #
@ -249,7 +247,6 @@
{ 'struct': 'QCryptoBlockInfoBase', { 'struct': 'QCryptoBlockInfoBase',
'data': { 'format': 'QCryptoBlockFormat' }} 'data': { 'format': 'QCryptoBlockFormat' }}
## ##
# @QCryptoBlockInfoLUKSSlot: # @QCryptoBlockInfoLUKSSlot:
# #
@ -269,7 +266,6 @@
'*stripes': 'int', '*stripes': 'int',
'key-offset': 'int' } } 'key-offset': 'int' } }
## ##
# @QCryptoBlockInfoLUKS: # @QCryptoBlockInfoLUKS:
# #
@ -323,7 +319,6 @@
{ 'enum': 'QCryptoBlockLUKSKeyslotState', { 'enum': 'QCryptoBlockLUKSKeyslotState',
'data': [ 'active', 'inactive' ] } 'data': [ 'active', 'inactive' ] }
## ##
# @QCryptoBlockAmendOptionsLUKS: # @QCryptoBlockAmendOptionsLUKS:
# #
@ -357,8 +352,7 @@
# password to use to retrieve current master key. # password to use to retrieve current master key.
# Defaults to the same secret that was used to open the image # Defaults to the same secret that was used to open the image
# #
# # Since: 5.1
# Since 5.1
## ##
{ 'struct': 'QCryptoBlockAmendOptionsLUKS', { 'struct': 'QCryptoBlockAmendOptionsLUKS',
'data': { 'state': 'QCryptoBlockLUKSKeyslotState', 'data': { 'state': 'QCryptoBlockLUKSKeyslotState',

1
qapi/job.json
View File

@ -173,7 +173,6 @@
## ##
{ 'command': 'job-cancel', 'data': { 'id': 'str' } } { 'command': 'job-cancel', 'data': { 'id': 'str' } }
## ##
# @job-complete: # @job-complete:
# #

1
qapi/machine-target.json
View File

@ -54,7 +54,6 @@
{ 'enum': 'CpuModelExpansionType', { 'enum': 'CpuModelExpansionType',
'data': [ 'static', 'full' ] } 'data': [ 'static', 'full' ] }
## ##
# @CpuModelCompareResult: # @CpuModelCompareResult:
# #

6
qapi/machine.json
View File

@ -77,7 +77,6 @@
# additional fields will be listed (since 3.0) # additional fields will be listed (since 3.0)
# #
# Since: 2.12 # Since: 2.12
#
## ##
{ 'union' : 'CpuInfoFast', { 'union' : 'CpuInfoFast',
'base' : { 'cpu-index' : 'int', 'base' : { 'cpu-index' : 'int',
@ -299,6 +298,7 @@
# returning does not indicate that a guest has accepted the request or # returning does not indicate that a guest has accepted the request or
# that it has shut down. Many guests will respond to this command by # that it has shut down. Many guests will respond to this command by
# prompting the user in some way. # prompting the user in some way.
#
# Example: # Example:
# #
# -> { "execute": "system_powerdown" } # -> { "execute": "system_powerdown" }
@ -972,7 +972,7 @@
# preconfigure stage to configure numa mapping before initializing # preconfigure stage to configure numa mapping before initializing
# machine. # machine.
# #
# Since 3.0 # Since: 3.0
## ##
{ 'command': 'set-numa-node', 'boxed': true, { 'command': 'set-numa-node', 'boxed': true,
'data': 'NumaOptions', 'data': 'NumaOptions',
@ -1021,7 +1021,6 @@
# Formula used: logical_vm_size = vm_ram_size - balloon_size # Formula used: logical_vm_size = vm_ram_size - balloon_size
# #
# Since: 0.14 # Since: 0.14
#
## ##
{ 'struct': 'BalloonInfo', 'data': {'actual': 'int' } } { 'struct': 'BalloonInfo', 'data': {'actual': 'int' } }
@ -1366,7 +1365,6 @@
{ 'event': 'MEMORY_DEVICE_SIZE_CHANGE', { 'event': 'MEMORY_DEVICE_SIZE_CHANGE',
'data': { '*id': 'str', 'size': 'size', 'qom-path' : 'str'} } 'data': { '*id': 'str', 'size': 'size', 'qom-path' : 'str'} }
## ##
# @MEM_UNPLUG_ERROR: # @MEM_UNPLUG_ERROR:
# #

11
qapi/migration.json
View File

@ -151,7 +151,6 @@
# (since 4.2) # (since 4.2)
# #
# Since: 2.3 # Since: 2.3
#
## ##
{ 'enum': 'MigrationStatus', { 'enum': 'MigrationStatus',
'data': [ 'none', 'setup', 'cancelling', 'cancelled', 'data': [ 'none', 'setup', 'cancelling', 'cancelled',
@ -166,7 +165,6 @@
# @transferred: amount of bytes transferred to the target VM by VFIO devices # @transferred: amount of bytes transferred to the target VM by VFIO devices
# #
# Since: 5.2 # Since: 5.2
#
## ##
{ 'struct': 'VfioStats', { 'struct': 'VfioStats',
'data': {'transferred': 'int' } } 'data': {'transferred': 'int' } }
@ -546,7 +544,6 @@
# @zstd: use zstd compression method. # @zstd: use zstd compression method.
# #
# Since: 5.0 # Since: 5.0
#
## ##
{ 'enum': 'MultiFDCompression', { 'enum': 'MultiFDCompression',
'data': [ 'none', 'zlib', 'data': [ 'none', 'zlib',
@ -1422,7 +1419,9 @@
# @state: The state the migration is currently expected to be in # @state: The state the migration is currently expected to be in
# #
# Returns: nothing on success # Returns: nothing on success
#
# Since: 2.11 # Since: 2.11
#
# Example: # Example:
# #
# -> { "execute": "migrate-continue" , "arguments": # -> { "execute": "migrate-continue" , "arguments":
@ -1736,6 +1735,7 @@
# Since: 4.2 # Since: 4.2
# #
# Example: # Example:
#
# <- { "event": "UNPLUG_PRIMARY", # <- { "event": "UNPLUG_PRIMARY",
# "data": { "device-id": "hostdev0" }, # "data": { "device-id": "hostdev0" },
# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } # "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
@ -1754,7 +1754,6 @@
# @dirty-rate: dirty rate. # @dirty-rate: dirty rate.
# #
# Since: 6.2 # Since: 6.2
#
## ##
{ 'struct': 'DirtyRateVcpu', { 'struct': 'DirtyRateVcpu',
'data': { 'id': 'int', 'dirty-rate': 'int64' } } 'data': { 'id': 'int', 'dirty-rate': 'int64' } }
@ -1771,7 +1770,6 @@
# @measured: the dirtyrate thread has measured and results are available. # @measured: the dirtyrate thread has measured and results are available.
# #
# Since: 5.2 # Since: 5.2
#
## ##
{ 'enum': 'DirtyRateStatus', { 'enum': 'DirtyRateStatus',
'data': [ 'unstarted', 'measuring', 'measured'] } 'data': [ 'unstarted', 'measuring', 'measured'] }
@ -1788,7 +1786,6 @@
# @dirty-bitmap: calculate dirtyrate by dirty bitmap. # @dirty-bitmap: calculate dirtyrate by dirty bitmap.
# #
# Since: 6.2 # Since: 6.2
#
## ##
{ 'enum': 'DirtyRateMeasureMode', { 'enum': 'DirtyRateMeasureMode',
'data': ['page-sampling', 'dirty-ring', 'dirty-bitmap'] } 'data': ['page-sampling', 'dirty-ring', 'dirty-bitmap'] }
@ -1818,7 +1815,6 @@
# mode specified (Since 6.2) # mode specified (Since 6.2)
# #
# Since: 5.2 # Since: 5.2
#
## ##
{ 'struct': 'DirtyRateInfo', { 'struct': 'DirtyRateInfo',
'data': {'*dirty-rate': 'int64', 'data': {'*dirty-rate': 'int64',
@ -1845,6 +1841,7 @@
# Since: 5.2 # Since: 5.2
# #
# Example: # Example:
#
# {"execute": "calc-dirty-rate", "arguments": {"calc-time": 1, # {"execute": "calc-dirty-rate", "arguments": {"calc-time": 1,
# 'sample-pages': 512} } # 'sample-pages': 512} }
# #

7
qapi/misc-target.json
View File

@ -21,7 +21,6 @@
{ 'command': 'rtc-reset-reinjection', { 'command': 'rtc-reset-reinjection',
'if': 'TARGET_I386' } 'if': 'TARGET_I386' }
## ##
# @SevState: # @SevState:
# #
@ -101,7 +100,6 @@
{ 'command': 'query-sev', 'returns': 'SevInfo', { 'command': 'query-sev', 'returns': 'SevInfo',
'if': 'TARGET_I386' } 'if': 'TARGET_I386' }
## ##
# @SevLaunchMeasureInfo: # @SevLaunchMeasureInfo:
# #
@ -110,7 +108,6 @@
# @data: the measurement value encoded in base64 # @data: the measurement value encoded in base64
# #
# Since: 2.12 # Since: 2.12
#
## ##
{ 'struct': 'SevLaunchMeasureInfo', 'data': {'data': 'str'}, { 'struct': 'SevLaunchMeasureInfo', 'data': {'data': 'str'},
'if': 'TARGET_I386' } 'if': 'TARGET_I386' }
@ -133,7 +130,6 @@
{ 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo', { 'command': 'query-sev-launch-measure', 'returns': 'SevLaunchMeasureInfo',
'if': 'TARGET_I386' } 'if': 'TARGET_I386' }
## ##
# @SevCapability: # @SevCapability:
# #
@ -194,7 +190,6 @@
# @gpa: the guest physical address where secret will be injected. # @gpa: the guest physical address where secret will be injected.
# #
# Since: 6.0 # Since: 6.0
#
## ##
{ 'command': 'sev-inject-launch-secret', { 'command': 'sev-inject-launch-secret',
'data': { 'packet-header': 'str', 'secret': 'str', '*gpa': 'uint64' }, 'data': { 'packet-header': 'str', 'secret': 'str', '*gpa': 'uint64' },
@ -208,7 +203,6 @@
# #
# @data: guest attestation report (base64 encoded) # @data: guest attestation report (base64 encoded)
# #
#
# Since: 6.1 # Since: 6.1
## ##
{ 'struct': 'SevAttestationReport', { 'struct': 'SevAttestationReport',
@ -307,7 +301,6 @@
{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'], { 'command': 'query-gic-capabilities', 'returns': ['GICCapability'],
'if': 'TARGET_ARM' } 'if': 'TARGET_ARM' }
## ##
# @SGXEPCSection: # @SGXEPCSection:
# #

2
qapi/misc.json
View File

@ -188,7 +188,7 @@
# Features: # Features:
# @unstable: This command is experimental. # @unstable: This command is experimental.
# #
# Since 3.0 # Since: 3.0
# #
# Returns: nothing # Returns: nothing
# #

3
qapi/pragma.json
View File

@ -6,7 +6,7 @@
# Whitelists to permit QAPI rule violations; think twice before you # Whitelists to permit QAPI rule violations; think twice before you
# add to them! # add to them!
{ 'pragma': { { 'pragma': {
# Commands allowed to return a non-dictionary: # Command names containing '_'
'command-name-exceptions': [ 'command-name-exceptions': [
'add_client', 'add_client',
'block_resize', 'block_resize',
@ -24,6 +24,7 @@
'system_powerdown', 'system_powerdown',
'system_reset', 'system_reset',
'system_wakeup' ], 'system_wakeup' ],
# Commands allowed to return a non-dictionary
'command-returns-exceptions': [ 'command-returns-exceptions': [
'human-monitor-command', 'human-monitor-command',
'qom-get', 'qom-get',

1
qapi/replay.json
View File

@ -40,7 +40,6 @@
# @icount: current number of executed instructions. # @icount: current number of executed instructions.
# #
# Since: 5.2 # Since: 5.2
#
## ##
{ 'struct': 'ReplayInfo', { 'struct': 'ReplayInfo',
'data': { 'mode': 'ReplayMode', '*filename': 'str', 'icount': 'int' } } 'data': { 'mode': 'ReplayMode', '*filename': 'str', 'icount': 'int' } }

6
qapi/run-state.json
View File

@ -348,7 +348,7 @@
# #
# @poweroff: Shutdown the VM and exit # @poweroff: Shutdown the VM and exit
# #
# @pause: pause the VM# # @pause: pause the VM
# #
# Since: 6.0 # Since: 6.0
## ##
@ -592,13 +592,11 @@
# @guest: memory failure at guest memory, # @guest: memory failure at guest memory,
# #
# Since: 5.2 # Since: 5.2
#
## ##
{ 'enum': 'MemoryFailureRecipient', { 'enum': 'MemoryFailureRecipient',
'data': [ 'hypervisor', 'data': [ 'hypervisor',
'guest' ] } 'guest' ] }
## ##
# @MemoryFailureAction: # @MemoryFailureAction:
# #
@ -619,7 +617,6 @@
# to handle memory failures. # to handle memory failures.
# #
# Since: 5.2 # Since: 5.2
#
## ##
{ 'enum': 'MemoryFailureAction', { 'enum': 'MemoryFailureAction',
'data': [ 'ignore', 'data': [ 'ignore',
@ -639,7 +636,6 @@
# failure was still in progress. # failure was still in progress.
# #
# Since: 5.2 # Since: 5.2
#
## ##
{ 'struct': 'MemoryFailureFlags', { 'struct': 'MemoryFailureFlags',
'data': { 'action-required': 'bool', 'data': { 'action-required': 'bool',

26
qapi/ui.json
View File

@ -15,7 +15,6 @@
# Display protocols which support changing password options. # Display protocols which support changing password options.
# #
# Since: 7.0 # Since: 7.0
#
## ##
{ 'enum': 'DisplayProtocol', { 'enum': 'DisplayProtocol',
'data': [ 'vnc', 'spice' ] } 'data': [ 'vnc', 'spice' ] }
@ -32,7 +31,6 @@
# @disconnect: disconnect existing clients # @disconnect: disconnect existing clients
# #
# Since: 7.0 # Since: 7.0
#
## ##
{ 'enum': 'SetPasswordAction', { 'enum': 'SetPasswordAction',
'data': [ 'keep', 'fail', 'disconnect' ] } 'data': [ 'keep', 'fail', 'disconnect' ] }
@ -52,7 +50,6 @@
# For VNC, only 'keep' is currently implemented. # For VNC, only 'keep' is currently implemented.
# #
# Since: 7.0 # Since: 7.0
#
## ##
{ 'union': 'SetPasswordOptions', { 'union': 'SetPasswordOptions',
'base': { 'protocol': 'DisplayProtocol', 'base': { 'protocol': 'DisplayProtocol',
@ -70,7 +67,6 @@
# Defaults to the first. # Defaults to the first.
# #
# Since: 7.0 # Since: 7.0
#
## ##
{ 'struct': 'SetPasswordOptionsVnc', { 'struct': 'SetPasswordOptionsVnc',
'data': { '*display': 'str' } } 'data': { '*display': 'str' } }
@ -115,7 +111,6 @@
# sure you are on the same machine as the QEMU instance. # sure you are on the same machine as the QEMU instance.
# #
# Since: 7.0 # Since: 7.0
#
## ##
{ 'union': 'ExpirePasswordOptions', { 'union': 'ExpirePasswordOptions',
'base': { 'protocol': 'DisplayProtocol', 'base': { 'protocol': 'DisplayProtocol',
@ -132,9 +127,7 @@
# Defaults to the first. # Defaults to the first.
# #
# Since: 7.0 # Since: 7.0
#
## ##
{ 'struct': 'ExpirePasswordOptionsVnc', { 'struct': 'ExpirePasswordOptionsVnc',
'data': { '*display': 'str' } } 'data': { '*display': 'str' } }
@ -167,7 +160,6 @@
# @ppm: PPM format # @ppm: PPM format
# #
# Since: 7.1 # Since: 7.1
#
## ##
{ 'enum': 'ImageFormat', { 'enum': 'ImageFormat',
'data': ['ppm', 'png'] } 'data': ['ppm', 'png'] }
@ -902,7 +894,6 @@
# are effectively synonyms. # are effectively synonyms.
# #
# Since: 1.3 # Since: 1.3
#
## ##
{ 'enum': 'QKeyCode', { 'enum': 'QKeyCode',
'data': [ 'unmapped', 'data': [ 'unmapped',
@ -1206,7 +1197,6 @@
# Since 3.1 # Since 3.1
# #
# Since: 2.12 # Since: 2.12
#
## ##
{ 'struct' : 'DisplayGTK', { 'struct' : 'DisplayGTK',
'data' : { '*grab-on-hover' : 'bool', 'data' : { '*grab-on-hover' : 'bool',
@ -1221,7 +1211,6 @@
# available node on the host. # available node on the host.
# #
# Since: 3.1 # Since: 3.1
#
## ##
{ 'struct' : 'DisplayEGLHeadless', { 'struct' : 'DisplayEGLHeadless',
'data' : { '*rendernode' : 'str' } } 'data' : { '*rendernode' : 'str' } }
@ -1242,7 +1231,6 @@
# @audiodev: Use the specified DBus audiodev to export audio. # @audiodev: Use the specified DBus audiodev to export audio.
# #
# Since: 7.0 # Since: 7.0
#
## ##
{ 'struct' : 'DisplayDBus', { 'struct' : 'DisplayDBus',
'data' : { '*rendernode' : 'str', 'data' : { '*rendernode' : 'str',
@ -1263,7 +1251,6 @@
# @es: Use OpenGL with ES (embedded systems) Context. # @es: Use OpenGL with ES (embedded systems) Context.
# #
# Since: 3.0 # Since: 3.0
#
## ##
{ 'enum' : 'DisplayGLMode', { 'enum' : 'DisplayGLMode',
'data' : [ 'off', 'on', 'core', 'es' ] } 'data' : [ 'off', 'on', 'core', 'es' ] }
@ -1276,7 +1263,6 @@
# @charset: Font charset used by guest (default: CP437). # @charset: Font charset used by guest (default: CP437).
# #
# Since: 4.0 # Since: 4.0
#
## ##
{ 'struct' : 'DisplayCurses', { 'struct' : 'DisplayCurses',
'data' : { '*charset' : 'str' } } 'data' : { '*charset' : 'str' } }
@ -1346,7 +1332,6 @@
# @dbus: Start a D-Bus service for the display. (Since 7.0) # @dbus: Start a D-Bus service for the display. (Since 7.0)
# #
# Since: 2.12 # Since: 2.12
#
## ##
{ 'enum' : 'DisplayType', { 'enum' : 'DisplayType',
'data' : [ 'data' : [
@ -1371,12 +1356,10 @@
# @type: Which DisplayType qemu should use. # @type: Which DisplayType qemu should use.
# @full-screen: Start user interface in fullscreen mode (default: off). # @full-screen: Start user interface in fullscreen mode (default: off).
# @window-close: Allow to quit qemu with window close button (default: on). # @window-close: Allow to quit qemu with window close button (default: on).
# @show-cursor: Force showing the mouse cursor (default: off). # @show-cursor: Force showing the mouse cursor (default: off). (since: 5.0)
# (since: 5.0)
# @gl: Enable OpenGL support (default: off). # @gl: Enable OpenGL support (default: off).
# #
# Since: 2.12 # Since: 2.12
#
## ##
{ 'union' : 'DisplayOptions', { 'union' : 'DisplayOptions',
'base' : { 'type' : 'DisplayType', 'base' : { 'type' : 'DisplayType',
@ -1403,7 +1386,6 @@
# Returns: @DisplayOptions # Returns: @DisplayOptions
# #
# Since: 3.1 # Since: 3.1
#
## ##
{ 'command': 'query-display-options', { 'command': 'query-display-options',
'returns': 'DisplayOptions' } 'returns': 'DisplayOptions' }
@ -1416,7 +1398,6 @@
# @vnc: VNC display # @vnc: VNC display
# #
# Since: 6.0 # Since: 6.0
#
## ##
{ 'enum': 'DisplayReloadType', { 'enum': 'DisplayReloadType',
'data': ['vnc'] } 'data': ['vnc'] }
@ -1429,7 +1410,6 @@
# @tls-certs: reload tls certs or not. # @tls-certs: reload tls certs or not.
# #
# Since: 6.0 # Since: 6.0
#
## ##
{ 'struct': 'DisplayReloadOptionsVNC', { 'struct': 'DisplayReloadOptionsVNC',
'data': { '*tls-certs': 'bool' } } 'data': { '*tls-certs': 'bool' } }
@ -1442,7 +1422,6 @@
# @type: Specify the display type. # @type: Specify the display type.
# #
# Since: 6.0 # Since: 6.0
#
## ##
{ 'union': 'DisplayReloadOptions', { 'union': 'DisplayReloadOptions',
'base': {'type': 'DisplayReloadType'}, 'base': {'type': 'DisplayReloadType'},
@ -1477,7 +1456,6 @@
# @vnc: VNC display # @vnc: VNC display
# #
# Since: 7.1 # Since: 7.1
#
## ##
{ 'enum': 'DisplayUpdateType', { 'enum': 'DisplayUpdateType',
'data': ['vnc'] } 'data': ['vnc'] }
@ -1492,7 +1470,6 @@
# for websockets are not touched. # for websockets are not touched.
# #
# Since: 7.1 # Since: 7.1
#
## ##
{ 'struct': 'DisplayUpdateOptionsVNC', { 'struct': 'DisplayUpdateOptionsVNC',
'data': { '*addresses': ['SocketAddress'] } } 'data': { '*addresses': ['SocketAddress'] } }
@ -1505,7 +1482,6 @@
# @type: Specify the display type. # @type: Specify the display type.
# #
# Since: 7.1 # Since: 7.1
#
## ##
{ 'union': 'DisplayUpdateOptions', { 'union': 'DisplayUpdateOptions',
'base': {'type': 'DisplayUpdateType'}, 'base': {'type': 'DisplayUpdateType'},

2
qga/qapi-schema.json
View File

@ -950,7 +950,7 @@
# by device mapper # by device mapper
# @smart: disk smart information (Since 7.1) # @smart: disk smart information (Since 7.1)
# #
# Since 5.2 # Since: 5.2
## ##
{ 'struct': 'GuestDiskInfo', { 'struct': 'GuestDiskInfo',
'data': {'name': 'str', 'partition': 'bool', '*dependencies': ['str'], 'data': {'name': 'str', 'partition': 'bool', '*dependencies': ['str'],

2
scripts/qapi/expr.py
View File

@ -443,7 +443,7 @@ def check_features(features: Optional[object],
check_keys(feat, info, source, ['name'], ['if']) check_keys(feat, info, source, ['name'], ['if'])
check_name_is_str(feat['name'], info, source) check_name_is_str(feat['name'], info, source)
source = "%s '%s'" % (source, feat['name']) source = "%s '%s'" % (source, feat['name'])
check_name_str(feat['name'], info, source) check_name_lower(feat['name'], info, source)
check_if(feat, info, source) check_if(feat, info, source)