aboutsummaryrefslogtreecommitdiff
path: root/qapi/tpm.json
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2021-09-17 16:31:16 +0200
committerMarkus Armbruster <armbru@redhat.com>2021-09-27 08:22:25 +0200
commit39dc3e4a4e3a485c8a8688bd29476fdbf95b0bb5 (patch)
tree2ad2f6d4543ac4f199f4ad556c26f8df7a37642d /qapi/tpm.json
parentb6fd5434de9cdf356fde37f55f52d121361e3297 (diff)
qapi: Convert simple union TpmTypeOptions 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 TpmTypeOptions to an equivalent flat one, with existing enum TpmType replacing implicit enum TpmTypeOptionsKind. Adds some boilerplate to the schema, which is a bit ugly, but a lot easier to maintain than the simple union feature. Cc: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Acked-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20210917143134.412106-6-armbru@redhat.com> [Indentation tidied up]
Diffstat (limited to 'qapi/tpm.json')
-rw-r--r--qapi/tpm.json24
1 files changed, 22 insertions, 2 deletions
diff --git a/qapi/tpm.json b/qapi/tpm.json
index f4dde2f646..4e2ea9756a 100644
--- a/qapi/tpm.json
+++ b/qapi/tpm.json
@@ -100,6 +100,24 @@
'if': 'CONFIG_TPM' }
##
+# @TPMPassthroughOptionsWrapper:
+#
+# Since: 1.5
+##
+{ 'struct': 'TPMPassthroughOptionsWrapper',
+ 'data': { 'data': 'TPMPassthroughOptions' },
+ 'if': 'CONFIG_TPM' }
+
+##
+# @TPMEmulatorOptionsWrapper:
+#
+# Since: 2.11
+##
+{ 'struct': 'TPMEmulatorOptionsWrapper',
+ 'data': { 'data': 'TPMEmulatorOptions' },
+ 'if': 'CONFIG_TPM' }
+
+##
# @TpmTypeOptions:
#
# A union referencing different TPM backend types' configuration options
@@ -110,8 +128,10 @@
# Since: 1.5
##
{ 'union': 'TpmTypeOptions',
- 'data': { 'passthrough' : 'TPMPassthroughOptions',
- 'emulator': 'TPMEmulatorOptions' },
+ 'base': { 'type': 'TpmType' },
+ 'discriminator': 'type',
+ 'data': { 'passthrough' : 'TPMPassthroughOptionsWrapper',
+ 'emulator': 'TPMEmulatorOptionsWrapper' },
'if': 'CONFIG_TPM' }
##