[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 06/25] qapi: Convert simple union MemoryDeviceInfo to flat one
From: |
Markus Armbruster |
Subject: |
[PULL v2 06/25] qapi: Convert simple union MemoryDeviceInfo to flat one |
Date: |
Mon, 27 Sep 2021 15:06:28 +0200 |
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>
---
qapi/machine.json | 42 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 4 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index 157712f006..32d47f4e35 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1194,6 +1194,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:
#
@@ -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'
}
}
--
2.31.1
- [PULL v2 05/25] qapi: Convert simple union TpmTypeOptions to flat one, (continued)
- [PULL v2 05/25] qapi: Convert simple union TpmTypeOptions to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 14/25] test-clone-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 17/25] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat, Markus Armbruster, 2021/09/27
- [PULL v2 08/25] qapi: Convert simple union SocketAddressLegacy to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 07/25] qapi: Convert simple union ChardevBackend to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 03/25] qapi: Convert simple union KeyValue to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 02/25] qapi: Stop enforcing "type name should not end in 'Kind', Markus Armbruster, 2021/09/27
- [PULL v2 10/25] qapi: Convert simple union TransactionAction to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 25/25] tests/qapi-schema: Make test-qapi.py -u work when files are absent, Markus Armbruster, 2021/09/27
- [PULL v2 18/25] test-clone-visitor: Wean off __org.qemu_x-Union1, Markus Armbruster, 2021/09/27
- [PULL v2 06/25] qapi: Convert simple union MemoryDeviceInfo to flat one,
Markus Armbruster <=
- [PULL v2 23/25] test-clone-visitor: Correct an accidental rename, Markus Armbruster, 2021/09/27
- [PULL v2 15/25] tests/qapi-schema: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 12/25] test-qobject-input-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 21/25] qapi: Drop simple unions, Markus Armbruster, 2021/09/27
- [PULL v2 20/25] tests/qapi-schema: Purge simple unions from tests, Markus Armbruster, 2021/09/27
- [PULL v2 22/25] tests/qapi-schema: Rename flat-union-* test cases to union-*, Markus Armbruster, 2021/09/27
- [PULL v2 13/25] test-qobject-output-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError, Markus Armbruster, 2021/09/27
- [PULL v2 01/25] qapi: Tidy up unusual line breaks, Markus Armbruster, 2021/09/27
- Re: [PULL v2 00/25] QAPI patches patches for 2021-09-25, Peter Maydell, 2021/09/27