aboutsummaryrefslogtreecommitdiff
path: root/qapi/qom.json
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2020-10-20 12:47:58 +0200
committerKevin Wolf <kwolf@redhat.com>2021-03-19 10:17:13 +0100
commitd09e49374b336d36a4223e8a411582128d3a3796 (patch)
tree0597839a437ca264ff95b112321bfe66a50199e5 /qapi/qom.json
parent39c4c27d378af56059628a5cd803d390849f32e8 (diff)
downloadqemu-d09e49374b336d36a4223e8a411582128d3a3796.zip
qemu-d09e49374b336d36a4223e8a411582128d3a3796.tar.gz
qemu-d09e49374b336d36a4223e8a411582128d3a3796.tar.bz2
qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded'
This adds a QAPI schema for the properties of the tls-* objects. The 'loaded' property doesn't seem to make sense as an external interface: It is automatically set to true in ucc->complete, and explicitly setting it to true earlier just means that additional options will be silently ignored. In other words, the 'loaded' property is useless. Mark it as deprecated in the schema from the start. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Peter Krempa <pkrempa@redhat.com> Acked-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qapi/qom.json')
-rw-r--r--qapi/qom.json12
1 files changed, 10 insertions, 2 deletions
diff --git a/qapi/qom.json b/qapi/qom.json
index a9ab10c..5f397d1 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -456,7 +456,11 @@
'rng-random',
'secret',
'secret_keyring',
- 'throttle-group'
+ 'throttle-group',
+ 'tls-creds-anon',
+ 'tls-creds-psk',
+ 'tls-creds-x509',
+ 'tls-cipher-suites'
] }
##
@@ -494,7 +498,11 @@
'rng-random': 'RngRandomProperties',
'secret': 'SecretProperties',
'secret_keyring': 'SecretKeyringProperties',
- 'throttle-group': 'ThrottleGroupProperties'
+ 'throttle-group': 'ThrottleGroupProperties',
+ 'tls-creds-anon': 'TlsCredsAnonProperties',
+ 'tls-creds-psk': 'TlsCredsPskProperties',
+ 'tls-creds-x509': 'TlsCredsX509Properties',
+ 'tls-cipher-suites': 'TlsCredsProperties'
} }
##