diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-09-17 16:31:17 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-09-27 08:23:09 +0200 |
| commit | db6a252bfda5c4aac8e0b360ad28e07981936945 (patch) | |
| tree | 845c54959619648b6e84fbd157d80d3d9c1189d3 /qapi | |
| parent | 39dc3e4a4e3a485c8a8688bd29476fdbf95b0bb5 (diff) | |
| download | qemu-db6a252bfda5c4aac8e0b360ad28e07981936945.zip qemu-db6a252bfda5c4aac8e0b360ad28e07981936945.tar.gz qemu-db6a252bfda5c4aac8e0b360ad28e07981936945.tar.bz2 | |
qapi: Convert simple union MemoryDeviceInfo to flat one
Simple unions predate flat unions. Having both complicates the QAPI
schema language and the QAPI generator. We haven't been using simple
unions in new code for a long time, because they are less flexible and
somewhat awkward on the wire.
To prepare for their removal, convert simple union MemoryDeviceInfo to
an equivalent flat one. Adds some boilerplate to the schema, which is
a bit ugly, but a lot easier to maintain than the simple union
feature.
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210917143134.412106-7-armbru@redhat.com>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/machine.json | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/qapi/machine.json b/qapi/machine.json index 157712f..32d47f4 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1195,6 +1195,38 @@ } ## +# @MemoryDeviceInfoKind: +# +# Since: 2.1 +## +{ 'enum': 'MemoryDeviceInfoKind', + 'data': [ 'dimm', 'nvdimm', 'virtio-pmem', 'virtio-mem' ] } + +## +# @PCDIMMDeviceInfoWrapper: +# +# Since: 2.1 +## +{ 'struct': 'PCDIMMDeviceInfoWrapper', + 'data': { 'data': 'PCDIMMDeviceInfo' } } + +## +# @VirtioPMEMDeviceInfoWrapper: +# +# Since: 2.1 +## +{ 'struct': 'VirtioPMEMDeviceInfoWrapper', + 'data': { 'data': 'VirtioPMEMDeviceInfo' } } + +## +# @VirtioMEMDeviceInfoWrapper: +# +# Since: 2.1 +## +{ 'struct': 'VirtioMEMDeviceInfoWrapper', + 'data': { 'data': 'VirtioMEMDeviceInfo' } } + +## # @MemoryDeviceInfo: # # Union containing information about a memory device @@ -1205,10 +1237,12 @@ # Since: 2.1 ## { 'union': 'MemoryDeviceInfo', - 'data': { 'dimm': 'PCDIMMDeviceInfo', - 'nvdimm': 'PCDIMMDeviceInfo', - 'virtio-pmem': 'VirtioPMEMDeviceInfo', - 'virtio-mem': 'VirtioMEMDeviceInfo' + 'base': { 'type': 'MemoryDeviceInfoKind' }, + 'discriminator': 'type', + 'data': { 'dimm': 'PCDIMMDeviceInfoWrapper', + 'nvdimm': 'PCDIMMDeviceInfoWrapper', + 'virtio-pmem': 'VirtioPMEMDeviceInfoWrapper', + 'virtio-mem': 'VirtioMEMDeviceInfoWrapper' } } |