[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/30] qapi/qom: Add ObjectOptions for secret*, deprecate 'loa
From: |
Kevin Wolf |
Subject: |
[PATCH v3 09/30] qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded' |
Date: |
Mon, 8 Mar 2021 17:54:19 +0100 |
This adds a QAPI schema for the properties of the secret* 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: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
qapi/crypto.json | 61 ++++++++++++++++++++++++++++++++++++++
qapi/qom.json | 5 ++++
docs/system/deprecated.rst | 11 +++++++
3 files changed, 77 insertions(+)
diff --git a/qapi/crypto.json b/qapi/crypto.json
index 2aebe6fa20..0fef3de66d 100644
--- a/qapi/crypto.json
+++ b/qapi/crypto.json
@@ -381,3 +381,64 @@
'discriminator': 'format',
'data': {
'luks': 'QCryptoBlockAmendOptionsLUKS' } }
+
+##
+# @SecretCommonProperties:
+#
+# Properties for objects of classes derived from secret-common.
+#
+# @loaded: if true, the secret is loaded immediately when applying this option
+# and will probably fail when processing the next option. Don't use;
+# only provided for compatibility. (default: false)
+#
+# @format: the data format that the secret is provided in (default: raw)
+#
+# @keyid: the name of another secret that should be used to decrypt the
+# provided data. If not present, the data is assumed to be unencrypted.
+#
+# @iv: the random initialization vector used for encryption of this particular
+# secret. Should be a base64 encrypted string of the 16-byte IV. Mandatory
+# if @keyid is given. Ignored if @keyid is absent.
+#
+# Features:
+# @deprecated: Member @loaded is deprecated. Setting true doesn't make sense,
+# and false is already the default.
+#
+# Since: 2.6
+##
+{ 'struct': 'SecretCommonProperties',
+ 'data': { '*loaded': { 'type': 'bool', 'features': ['deprecated'] },
+ '*format': 'QCryptoSecretFormat',
+ '*keyid': 'str',
+ '*iv': 'str' } }
+
+##
+# @SecretProperties:
+#
+# Properties for secret objects.
+#
+# Either @data or @file must be provided, but not both.
+#
+# @data: the associated with the secret from
+#
+# @file: the filename to load the data associated with the secret from
+#
+# Since: 2.6
+##
+{ 'struct': 'SecretProperties',
+ 'base': 'SecretCommonProperties',
+ 'data': { '*data': 'str',
+ '*file': 'str' } }
+
+##
+# @SecretKeyringProperties:
+#
+# Properties for secret_keyring objects.
+#
+# @serial: serial number that identifies a key to get from the kernel
+#
+# Since: 5.1
+##
+{ 'struct': 'SecretKeyringProperties',
+ 'base': 'SecretCommonProperties',
+ 'data': { 'serial': 'int32' } }
diff --git a/qapi/qom.json b/qapi/qom.json
index 0721a636f9..e4bbddd986 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -7,6 +7,7 @@
{ 'include': 'authz.json' }
{ 'include': 'block-core.json' }
{ 'include': 'common.json' }
+{ 'include': 'crypto.json' }
##
# = QEMU Object Model (QOM)
@@ -451,6 +452,8 @@
'rng-builtin',
'rng-egd',
'rng-random',
+ 'secret',
+ 'secret_keyring',
'throttle-group'
] }
@@ -487,6 +490,8 @@
'rng-builtin': 'RngProperties',
'rng-egd': 'RngEgdProperties',
'rng-random': 'RngRandomProperties',
+ 'secret': 'SecretProperties',
+ 'secret_keyring': 'SecretKeyringProperties',
'throttle-group': 'ThrottleGroupProperties'
} }
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 3dac79f600..f4e8226963 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -162,6 +162,17 @@ other options have been processed. This will either have
no effect (if
``opened`` was the last option) or cause errors. The property is therefore
useless and should not be specified.
+``loaded`` property of ``secret`` and ``secret_keyring`` objects (since 6.0.0)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+The only effect of specifying ``loaded=on`` in the command line or QMP
+``object-add`` is that the secret is loaded immediately, possibly before all
+other options have been processed. This will either have no effect (if
+``loaded`` was the last option) or cause options to be effectively ignored as
+if they were not given. The property is therefore useless and should not be
+specified.
+
+
QEMU Machine Protocol (QMP) commands
------------------------------------
--
2.29.2
- [PATCH v3 01/30] qapi/qom: Drop deprecated 'props' from object-add, (continued)
- [PATCH v3 01/30] qapi/qom: Drop deprecated 'props' from object-add, Kevin Wolf, 2021/03/08
- [PATCH v3 02/30] qapi/qom: Add ObjectOptions for iothread, Kevin Wolf, 2021/03/08
- [PATCH v3 03/30] qapi/qom: Add ObjectOptions for authz-*, Kevin Wolf, 2021/03/08
- [PATCH v3 04/30] qapi/qom: Add ObjectOptions for cryptodev-*, Kevin Wolf, 2021/03/08
- [PATCH v3 05/30] qapi/qom: Add ObjectOptions for dbus-vmstate, Kevin Wolf, 2021/03/08
- [PATCH v3 06/30] qapi/qom: Add ObjectOptions for memory-backend-*, Kevin Wolf, 2021/03/08
- [PATCH v3 07/30] qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened', Kevin Wolf, 2021/03/08
- [PATCH v3 09/30] qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded',
Kevin Wolf <=
- [PATCH v3 10/30] qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded', Kevin Wolf, 2021/03/08
- [PATCH v3 11/30] qapi/qom: Add ObjectOptions for can-*, Kevin Wolf, 2021/03/08
- [PATCH v3 12/30] qapi/qom: Add ObjectOptions for colo-compare, Kevin Wolf, 2021/03/08
- [PATCH v3 14/30] qapi/qom: Add ObjectOptions for pr-manager-helper, Kevin Wolf, 2021/03/08
- [PATCH v3 13/30] qapi/qom: Add ObjectOptions for filter-*, Kevin Wolf, 2021/03/08
- [PATCH v3 17/30] qapi/qom: Add ObjectOptions for x-remote-object, Kevin Wolf, 2021/03/08
- [PATCH v3 18/30] qapi/qom: QAPIfy object-add, Kevin Wolf, 2021/03/08
- [PATCH v3 19/30] qom: Make "object" QemuOptsList optional, Kevin Wolf, 2021/03/08