qapi: Plug trivial documentation holes around former simple unions

The conversion of simple to flat unions left the @data members
undocumented.  Add documentation where it's trivial.  Copy verbatim
from the wrapped type's description where possible.

Leftovers: String (to be taken care of in the next commit), and
TransActionAction (left for another day).

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240205074709.3613229-13-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Markus Armbruster 2024-02-05 08:47:06 +01:00
parent a57790f7d7
commit 2fecccbc84
7 changed files with 68 additions and 34 deletions

View file

@ -196,6 +196,8 @@
## ##
# @ImageInfoSpecificQCow2Wrapper: # @ImageInfoSpecificQCow2Wrapper:
# #
# @data: image information specific to QCOW2
#
# Since: 1.7 # Since: 1.7
## ##
{ 'struct': 'ImageInfoSpecificQCow2Wrapper', { 'struct': 'ImageInfoSpecificQCow2Wrapper',
@ -204,6 +206,8 @@
## ##
# @ImageInfoSpecificVmdkWrapper: # @ImageInfoSpecificVmdkWrapper:
# #
# @data: image information specific to VMDK
#
# Since: 6.1 # Since: 6.1
## ##
{ 'struct': 'ImageInfoSpecificVmdkWrapper', { 'struct': 'ImageInfoSpecificVmdkWrapper',
@ -212,6 +216,8 @@
## ##
# @ImageInfoSpecificLUKSWrapper: # @ImageInfoSpecificLUKSWrapper:
# #
# @data: image information specific to LUKS
#
# Since: 2.7 # Since: 2.7
## ##
{ 'struct': 'ImageInfoSpecificLUKSWrapper', { 'struct': 'ImageInfoSpecificLUKSWrapper',
@ -223,6 +229,8 @@
## ##
# @ImageInfoSpecificRbdWrapper: # @ImageInfoSpecificRbdWrapper:
# #
# @data: image information specific to RBD
#
# Since: 6.1 # Since: 6.1
## ##
{ 'struct': 'ImageInfoSpecificRbdWrapper', { 'struct': 'ImageInfoSpecificRbdWrapper',
@ -231,6 +239,8 @@
## ##
# @ImageInfoSpecificFileWrapper: # @ImageInfoSpecificFileWrapper:
# #
# @data: image information specific to files
#
# Since: 8.0 # Since: 8.0
## ##
{ 'struct': 'ImageInfoSpecificFileWrapper', { 'struct': 'ImageInfoSpecificFileWrapper',

View file

@ -498,6 +498,8 @@
## ##
# @ChardevFileWrapper: # @ChardevFileWrapper:
# #
# @data: Configuration info for file chardevs
#
# Since: 1.4 # Since: 1.4
## ##
{ 'struct': 'ChardevFileWrapper', { 'struct': 'ChardevFileWrapper',
@ -506,6 +508,8 @@
## ##
# @ChardevHostdevWrapper: # @ChardevHostdevWrapper:
# #
# @data: Configuration info for device and pipe chardevs
#
# Since: 1.4 # Since: 1.4
## ##
{ 'struct': 'ChardevHostdevWrapper', { 'struct': 'ChardevHostdevWrapper',
@ -514,6 +518,8 @@
## ##
# @ChardevSocketWrapper: # @ChardevSocketWrapper:
# #
# @data: Configuration info for (stream) socket chardevs
#
# Since: 1.4 # Since: 1.4
## ##
{ 'struct': 'ChardevSocketWrapper', { 'struct': 'ChardevSocketWrapper',
@ -522,6 +528,8 @@
## ##
# @ChardevUdpWrapper: # @ChardevUdpWrapper:
# #
# @data: Configuration info for datagram socket chardevs
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'ChardevUdpWrapper', { 'struct': 'ChardevUdpWrapper',
@ -530,6 +538,8 @@
## ##
# @ChardevCommonWrapper: # @ChardevCommonWrapper:
# #
# @data: Configuration shared across all chardev backends
#
# Since: 2.6 # Since: 2.6
## ##
{ 'struct': 'ChardevCommonWrapper', { 'struct': 'ChardevCommonWrapper',
@ -538,6 +548,8 @@
## ##
# @ChardevMuxWrapper: # @ChardevMuxWrapper:
# #
# @data: Configuration info for mux chardevs
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'ChardevMuxWrapper', { 'struct': 'ChardevMuxWrapper',
@ -546,6 +558,8 @@
## ##
# @ChardevStdioWrapper: # @ChardevStdioWrapper:
# #
# @data: Configuration info for stdio chardevs
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'ChardevStdioWrapper', { 'struct': 'ChardevStdioWrapper',
@ -554,6 +568,8 @@
## ##
# @ChardevSpiceChannelWrapper: # @ChardevSpiceChannelWrapper:
# #
# @data: Configuration info for spice vm channel chardevs
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'ChardevSpiceChannelWrapper', { 'struct': 'ChardevSpiceChannelWrapper',
@ -563,6 +579,8 @@
## ##
# @ChardevSpicePortWrapper: # @ChardevSpicePortWrapper:
# #
# @data: Configuration info for spice port chardevs
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'ChardevSpicePortWrapper', { 'struct': 'ChardevSpicePortWrapper',
@ -572,6 +590,8 @@
## ##
# @ChardevQemuVDAgentWrapper: # @ChardevQemuVDAgentWrapper:
# #
# @data: Configuration info for qemu vdagent implementation
#
# Since: 6.1 # Since: 6.1
## ##
{ 'struct': 'ChardevQemuVDAgentWrapper', { 'struct': 'ChardevQemuVDAgentWrapper',
@ -581,6 +601,8 @@
## ##
# @ChardevDBusWrapper: # @ChardevDBusWrapper:
# #
# @data: Configuration info for DBus chardevs
#
# Since: 7.0 # Since: 7.0
## ##
{ 'struct': 'ChardevDBusWrapper', { 'struct': 'ChardevDBusWrapper',
@ -590,6 +612,8 @@
## ##
# @ChardevVCWrapper: # @ChardevVCWrapper:
# #
# @data: Configuration info for virtual console chardevs
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'ChardevVCWrapper', { 'struct': 'ChardevVCWrapper',
@ -598,6 +622,8 @@
## ##
# @ChardevRingbufWrapper: # @ChardevRingbufWrapper:
# #
# @data: Configuration info for ring buffer chardevs
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'ChardevRingbufWrapper', { 'struct': 'ChardevRingbufWrapper',

View file

@ -1396,6 +1396,8 @@
## ##
# @PCDIMMDeviceInfoWrapper: # @PCDIMMDeviceInfoWrapper:
# #
# @data: PCDIMMDevice state information
#
# Since: 2.1 # Since: 2.1
## ##
{ 'struct': 'PCDIMMDeviceInfoWrapper', { 'struct': 'PCDIMMDeviceInfoWrapper',
@ -1404,6 +1406,8 @@
## ##
# @VirtioPMEMDeviceInfoWrapper: # @VirtioPMEMDeviceInfoWrapper:
# #
# @data: VirtioPMEM state information
#
# Since: 2.1 # Since: 2.1
## ##
{ 'struct': 'VirtioPMEMDeviceInfoWrapper', { 'struct': 'VirtioPMEMDeviceInfoWrapper',
@ -1412,6 +1416,8 @@
## ##
# @VirtioMEMDeviceInfoWrapper: # @VirtioMEMDeviceInfoWrapper:
# #
# @data: VirtioMEMDevice state information
#
# Since: 2.1 # Since: 2.1
## ##
{ 'struct': 'VirtioMEMDeviceInfoWrapper', { 'struct': 'VirtioMEMDeviceInfoWrapper',
@ -1420,6 +1426,8 @@
## ##
# @SgxEPCDeviceInfoWrapper: # @SgxEPCDeviceInfoWrapper:
# #
# @data: Sgx EPC state information
#
# Since: 6.2 # Since: 6.2
## ##
{ 'struct': 'SgxEPCDeviceInfoWrapper', { 'struct': 'SgxEPCDeviceInfoWrapper',
@ -1428,6 +1436,8 @@
## ##
# @HvBalloonDeviceInfoWrapper: # @HvBalloonDeviceInfoWrapper:
# #
# @data: hv-balloon provided memory state information
#
# Since: 8.2 # Since: 8.2
## ##
{ 'struct': 'HvBalloonDeviceInfoWrapper', { 'struct': 'HvBalloonDeviceInfoWrapper',

View file

@ -52,19 +52,6 @@
'BlockdevVmdkAdapterType', 'BlockdevVmdkAdapterType',
'ChardevBackend', 'ChardevBackend',
'ChardevBackendKind', 'ChardevBackendKind',
'ChardevCommonWrapper',
'ChardevDBusWrapper',
'ChardevFileWrapper',
'ChardevHostdevWrapper',
'ChardevMuxWrapper',
'ChardevQemuVDAgentWrapper',
'ChardevRingbufWrapper',
'ChardevSocketWrapper',
'ChardevSpiceChannelWrapper',
'ChardevSpicePortWrapper',
'ChardevStdioWrapper',
'ChardevUdpWrapper',
'ChardevVCWrapper',
'CpuS390Entitlement', 'CpuS390Entitlement',
'CpuS390Polarization', 'CpuS390Polarization',
'CpuS390State', 'CpuS390State',
@ -77,24 +64,12 @@
'GrabToggleKeys', 'GrabToggleKeys',
'GuestPanicInformationHyperV', 'GuestPanicInformationHyperV',
'HotKeyMod', 'HotKeyMod',
'HvBalloonDeviceInfoWrapper',
'ImageInfoSpecific', 'ImageInfoSpecific',
'ImageInfoSpecificFileWrapper',
'ImageInfoSpecificKind', 'ImageInfoSpecificKind',
'ImageInfoSpecificLUKSWrapper',
'ImageInfoSpecificQCow2Wrapper',
'ImageInfoSpecificRbdWrapper',
'ImageInfoSpecificVmdkWrapper',
'InetSocketAddressWrapper',
'InputAxis', 'InputAxis',
'InputBtnEventWrapper',
'InputButton', 'InputButton',
'InputKeyEventWrapper',
'InputMoveEventWrapper',
'InputMultiTouchEvent', 'InputMultiTouchEvent',
'InputMultiTouchEventWrapper',
'InputMultiTouchType', 'InputMultiTouchType',
'IntWrapper',
'IscsiHeaderDigest', 'IscsiHeaderDigest',
'IscsiTransport', 'IscsiTransport',
'JSONType', 'JSONType',
@ -107,18 +82,15 @@
'NetClientDriver', 'NetClientDriver',
'NumaOptions', 'NumaOptions',
'ObjectType', 'ObjectType',
'PCDIMMDeviceInfoWrapper',
'PciMemoryRegion', 'PciMemoryRegion',
'QCryptoAkCipherKeyType', 'QCryptoAkCipherKeyType',
'QCryptoAkCipherOptions', 'QCryptoAkCipherOptions',
'QCryptodevBackendServiceType', 'QCryptodevBackendServiceType',
'QKeyCode', 'QKeyCode',
'QKeyCodeWrapper',
'Qcow2OverlapCheckFlags', 'Qcow2OverlapCheckFlags',
'RbdAuthMode', 'RbdAuthMode',
'RbdEncryptionCreateOptions', 'RbdEncryptionCreateOptions',
'RbdImageEncryptionFormat', 'RbdImageEncryptionFormat',
'SgxEPCDeviceInfoWrapper',
'SocketAddressLegacy', 'SocketAddressLegacy',
'SshHostKeyCheck', 'SshHostKeyCheck',
'StatsFilter', 'StatsFilter',
@ -126,16 +98,10 @@
'String', 'String',
'StringWrapper', 'StringWrapper',
'SysEmuTarget', 'SysEmuTarget',
'TPMEmulatorOptionsWrapper',
'TPMPassthroughOptionsWrapper',
'ThrottleGroupProperties', 'ThrottleGroupProperties',
'TransactionAction', 'TransactionAction',
'UnixSocketAddressWrapper',
'VirtioMEMDeviceInfoWrapper',
'VirtioPMEMDeviceInfoWrapper',
'VncPrimaryAuth', 'VncPrimaryAuth',
'VncVencryptSubAuth', 'VncVencryptSubAuth',
'VsockSocketAddressWrapper',
'X86CPURegister32', 'X86CPURegister32',
'XDbgBlockGraph', 'XDbgBlockGraph',
'YankInstance', 'YankInstance',

View file

@ -119,6 +119,8 @@
## ##
# @InetSocketAddressWrapper: # @InetSocketAddressWrapper:
# #
# @data: internet domain socket address
#
# Since: 1.3 # Since: 1.3
## ##
{ 'struct': 'InetSocketAddressWrapper', { 'struct': 'InetSocketAddressWrapper',
@ -127,6 +129,8 @@
## ##
# @UnixSocketAddressWrapper: # @UnixSocketAddressWrapper:
# #
# @data: UNIX domain socket address
#
# Since: 1.3 # Since: 1.3
## ##
{ 'struct': 'UnixSocketAddressWrapper', { 'struct': 'UnixSocketAddressWrapper',
@ -135,6 +139,8 @@
## ##
# @VsockSocketAddressWrapper: # @VsockSocketAddressWrapper:
# #
# @data: VSOCK domain socket address
#
# Since: 2.8 # Since: 2.8
## ##
{ 'struct': 'VsockSocketAddressWrapper', { 'struct': 'VsockSocketAddressWrapper',

View file

@ -102,6 +102,8 @@
## ##
# @TPMPassthroughOptionsWrapper: # @TPMPassthroughOptionsWrapper:
# #
# @data: Information about the TPM passthrough type
#
# Since: 1.5 # Since: 1.5
## ##
{ 'struct': 'TPMPassthroughOptionsWrapper', { 'struct': 'TPMPassthroughOptionsWrapper',
@ -111,6 +113,8 @@
## ##
# @TPMEmulatorOptionsWrapper: # @TPMEmulatorOptionsWrapper:
# #
# @data: Information about the TPM emulator type
#
# Since: 2.11 # Since: 2.11
## ##
{ 'struct': 'TPMEmulatorOptionsWrapper', { 'struct': 'TPMEmulatorOptionsWrapper',

View file

@ -990,6 +990,8 @@
## ##
# @IntWrapper: # @IntWrapper:
# #
# @data: a numeric key code
#
# Since: 1.3 # Since: 1.3
## ##
{ 'struct': 'IntWrapper', { 'struct': 'IntWrapper',
@ -998,6 +1000,8 @@
## ##
# @QKeyCodeWrapper: # @QKeyCodeWrapper:
# #
# @data: An enumeration of key name
#
# Since: 1.3 # Since: 1.3
## ##
{ 'struct': 'QKeyCodeWrapper', { 'struct': 'QKeyCodeWrapper',
@ -1175,6 +1179,8 @@
## ##
# @InputKeyEventWrapper: # @InputKeyEventWrapper:
# #
# @data: Keyboard input event
#
# Since: 2.0 # Since: 2.0
## ##
{ 'struct': 'InputKeyEventWrapper', { 'struct': 'InputKeyEventWrapper',
@ -1183,6 +1189,8 @@
## ##
# @InputBtnEventWrapper: # @InputBtnEventWrapper:
# #
# @data: Pointer button input event
#
# Since: 2.0 # Since: 2.0
## ##
{ 'struct': 'InputBtnEventWrapper', { 'struct': 'InputBtnEventWrapper',
@ -1191,6 +1199,8 @@
## ##
# @InputMoveEventWrapper: # @InputMoveEventWrapper:
# #
# @data: Pointer motion input event
#
# Since: 2.0 # Since: 2.0
## ##
{ 'struct': 'InputMoveEventWrapper', { 'struct': 'InputMoveEventWrapper',
@ -1199,6 +1209,8 @@
## ##
# @InputMultiTouchEventWrapper: # @InputMultiTouchEventWrapper:
# #
# @data: MultiTouch input event
#
# Since: 8.1 # Since: 8.1
## ##
{ 'struct': 'InputMultiTouchEventWrapper', { 'struct': 'InputMultiTouchEventWrapper',