[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/10] qapi: Formalize qcow2 encryption probing
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 04/10] qapi: Formalize qcow2 encryption probing |
Date: |
Mon, 11 Jun 2018 22:51:57 +0200 |
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 | 44 ++++++++++++++++++++++++++++++++++++++++----
block/qcow2.c | 3 +++
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 4bd85dd1bb..295ace42ae 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -44,6 +44,19 @@
{ 'struct': 'ImageInfoSpecificQCow2EncryptionBase',
'data': { 'format': 'BlockdevQcow2EncryptionFormat'}}
+##
+# @ImageInfoSpecificQCow2EncryptionNoInfo:
+#
+# Only used for the qcow2 encryption format "auto" in which the actual
+# encryption format is determined from the image header. Therefore,
+# this encryption format will never be reported in
+# ImageInfoSpecificQCow2Encryption.
+#
+# Since: 3.0
+##
+{ 'struct': 'ImageInfoSpecificQCow2EncryptionNoInfo',
+ 'data': { } }
+
##
# @ImageInfoSpecificQCow2Encryption:
#
@@ -53,7 +66,8 @@
'base': 'ImageInfoSpecificQCow2EncryptionBase',
'discriminator': 'format',
'data': { 'aes': 'QCryptoBlockInfoQCow',
- 'luks': 'QCryptoBlockInfoLUKS' } }
+ 'luks': 'QCryptoBlockInfoLUKS',
+ 'auto': 'ImageInfoSpecificQCow2EncryptionNoInfo' } }
##
# @ImageInfoSpecificQCow2:
@@ -2658,10 +2672,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: 3.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: 3.0
+##
+{ 'struct': 'BlockdevQcow2EncryptionSecret',
+ 'data': { '*key-secret': 'str' } }
##
# @BlockdevQcow2Encryption:
@@ -2669,10 +2703,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 945132f692..6bfcba4ee1 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -868,6 +868,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.17.1
- [Qemu-devel] [PATCH v2 00/10] block: Try to create well typed json:{} filenames, Max Reitz, 2018/06/11
- [Qemu-devel] [PATCH v2 02/10] docs/qapi: Document optional discriminators, Max Reitz, 2018/06/11
- [Qemu-devel] [PATCH v2 01/10] qapi: Add default-variant for flat unions, Max Reitz, 2018/06/11
- [Qemu-devel] [PATCH v2 03/10] tests: Add QAPI optional discriminator tests, Max Reitz, 2018/06/11
- [Qemu-devel] [PATCH v2 04/10] qapi: Formalize qcow2 encryption probing,
Max Reitz <=
- [Qemu-devel] [PATCH v2 05/10] qapi: Formalize qcow encryption probing, Max Reitz, 2018/06/11
- [Qemu-devel] [PATCH v2 06/10] qdict: Make qdict_flatten() shallow-clone-friendly, Max Reitz, 2018/06/11
- [Qemu-devel] [PATCH v2 07/10] tests: Add QDict clone-flatten test, Max Reitz, 2018/06/11