Currently, you can give no encryption format for a qcow2 file while
still passing a key-secret. That does not conform to the schema, so
this patch changes the schema to allow it.
Signed-off-by: Max Reitz <mre...@redhat.com>
---
qapi/block-core.json | 32 +++++++++++++++++++++++++++++---
block/qcow2.c | 3 +++
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 0d43d4f37c..9df3fc8bd7 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -47,6 +47,9 @@
##
# @ImageInfoSpecificQCow2Encryption:
#
+# @format will never be "auto", as this pseudo-format just tells the
+# qcow2 driver to read the actual format from the image header.
+#
# Since: 2.10
##
{ 'union': 'ImageInfoSpecificQCow2Encryption',
@@ -3081,10 +3084,30 @@
# @BlockdevQcow2EncryptionFormat:
# @aes: AES-CBC with plain64 initialization vectors
#
+# @auto: Determine the encryption format from the image
+# header. This only allows the use of the
+# key-secret option. (Since: 4.1)
+#
# Since: 2.10
##
{ 'enum': 'BlockdevQcow2EncryptionFormat',
- 'data': [ 'aes', 'luks' ] }
+ 'data': [ 'aes', 'luks', 'auto' ] }
+
+##
+# @BlockdevQcow2EncryptionSecret:
+#
+# Allows specifying a key-secret without specifying the exact
+# encryption format, which is determined automatically from the image
+# header.
+#
+# @key-secret: The ID of a QCryptoSecret object providing the
+# decryption key. Mandatory except when probing
+# image for metadata only.
+#
+# Since: 4.1
+##
+{ 'struct': 'BlockdevQcow2EncryptionSecret',
+ 'data': { '*key-secret': 'str' } }
##
# @BlockdevQcow2Encryption:
@@ -3092,10 +3115,13 @@
# Since: 2.10
##
{ 'union': 'BlockdevQcow2Encryption',
- 'base': { 'format': 'BlockdevQcow2EncryptionFormat' },
+ 'base': {
+ '*format': { 'type': 'BlockdevQcow2EncryptionFormat', 'default': 'auto' }
+ },
'discriminator': 'format',
'data': { 'aes': 'QCryptoBlockOptionsQCow',
- 'luks': 'QCryptoBlockOptionsLUKS'} }
+ 'luks': 'QCryptoBlockOptionsLUKS',
+ 'auto': 'BlockdevQcow2EncryptionSecret' } }
##
# @BlockdevOptionsQcow2:
diff --git a/block/qcow2.c b/block/qcow2.c
index 9396d490d5..95de19d906 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -930,6 +930,9 @@ static int qcow2_update_options_prepare(BlockDriverState
*bs,
qdict_extract_subqdict(options, &encryptopts, "encrypt.");
encryptfmt = qdict_get_try_str(encryptopts, "format");
+ if (!g_strcmp0(encryptfmt, "auto")) {
+ encryptfmt = NULL;
+ }
opts = qemu_opts_create(&qcow2_runtime_opts, NULL, 0, &error_abort);
qemu_opts_absorb_qdict(opts, options, &local_err);
--
2.21.0
