[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 4/8] qapi: Formalize qcow2 encryption probing
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v3 4/8] qapi: Formalize qcow2 encryption probing |
Date: |
Wed, 6 Feb 2019 20:55:47 +0100 |
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 <address@hidden>
---
qapi/block-core.json | 31 ++++++++++++++++++++++++++++---
block/qcow2.c | 3 +++
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 5f17d67d71..abf9af0c4d 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',
@@ -2961,10 +2964,30 @@
# @BlockdevQcow2EncryptionFormat:
# @aes: AES-CBC with plain64 initialization venctors
#
+# @auto: Determine the encryption format from the image
+# header. This only allows the use of the
+# key-secret option. (Since: 4.0)
+#
# 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.0
+##
+{ 'struct': 'BlockdevQcow2EncryptionSecret',
+ 'data': { '*key-secret': 'str' } }
##
# @BlockdevQcow2Encryption:
@@ -2972,10 +2995,12 @@
# Since: 2.10
##
{ 'union': 'BlockdevQcow2Encryption',
- 'base': { 'format': 'BlockdevQcow2EncryptionFormat' },
+ 'base': { '*format': 'BlockdevQcow2EncryptionFormat' },
'discriminator': 'format',
+ 'default-variant': 'auto',
'data': { 'aes': 'QCryptoBlockOptionsQCow',
- 'luks': 'QCryptoBlockOptionsLUKS'} }
+ 'luks': 'QCryptoBlockOptionsLUKS',
+ 'auto': 'BlockdevQcow2EncryptionSecret' } }
##
# @BlockdevOptionsQcow2:
diff --git a/block/qcow2.c b/block/qcow2.c
index c21452bc2f..5885f5175e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -883,6 +883,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.20.1
- [Qemu-block] [PATCH v3 0/8] block: Try to create well-typed json:{} filenames, Max Reitz, 2019/02/06
- [Qemu-block] [PATCH v3 2/8] docs/qapi: Document optional discriminators, Max Reitz, 2019/02/06
- [Qemu-block] [PATCH v3 3/8] tests: Add QAPI optional discriminator tests, Max Reitz, 2019/02/06
- [Qemu-block] [PATCH v3 4/8] qapi: Formalize qcow2 encryption probing,
Max Reitz <=
- [Qemu-block] [PATCH v3 5/8] qapi: Formalize qcow encryption probing, Max Reitz, 2019/02/06
- [Qemu-block] [PATCH v3 6/8] block: Try to create well typed json:{} filenames, Max Reitz, 2019/02/06
- [Qemu-block] [PATCH v3 7/8] iotests: Test internal option typing, Max Reitz, 2019/02/06
- [Qemu-block] [PATCH v3 8/8] iotests: qcow2's encrypt.format is now optional, Max Reitz, 2019/02/06