[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/13] qapi: Formalize qcow encryption probing
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 05/13] qapi: Formalize qcow encryption probing |
Date: |
Wed, 9 May 2018 18:55:22 +0200 |
Currently, you can give no encryption format for a qcow 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 | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 092a1aba2d..d98af0a71d 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2712,15 +2712,35 @@
'data': { 'flags': 'Qcow2OverlapCheckFlags',
'mode': 'Qcow2OverlapCheckMode' } }
+##
+# @BlockdevQcowEncryptionSecret:
+#
+# 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: 2.13
+##
+{ 'struct': 'BlockdevQcowEncryptionSecret',
+ 'data': { '*key-secret': 'str' } }
+
##
# @BlockdevQcowEncryptionFormat:
#
# @aes: AES-CBC with plain64 initialization vectors
#
+# @from-image: Determine the encryption format from the image
+# header. This only allows the use of the
+# key-secret option. (Since: 2.13)
+#
# Since: 2.10
##
{ 'enum': 'BlockdevQcowEncryptionFormat',
- 'data': [ 'aes' ] }
+ 'data': [ 'aes', 'from-image' ] }
##
# @BlockdevQcowEncryption:
@@ -2728,9 +2748,11 @@
# Since: 2.10
##
{ 'union': 'BlockdevQcowEncryption',
- 'base': { 'format': 'BlockdevQcowEncryptionFormat' },
+ 'base': { '*format': 'BlockdevQcowEncryptionFormat' },
'discriminator': 'format',
- 'data': { 'aes': 'QCryptoBlockOptionsQCow' } }
+ 'default-variant': 'from-image',
+ 'data': { 'aes': 'QCryptoBlockOptionsQCow',
+ 'from-image': 'BlockdevQcowEncryptionSecret' } }
##
# @BlockdevOptionsQcow:
--
2.14.3
[Qemu-devel] [PATCH 03/13] tests: Add QAPI optional discriminator tests, Max Reitz, 2018/05/09
[Qemu-devel] [PATCH 04/13] qapi: Formalize qcow2 encryption probing, Max Reitz, 2018/05/09
[Qemu-devel] [PATCH 05/13] qapi: Formalize qcow encryption probing,
Max Reitz <=
[Qemu-devel] [PATCH 07/13] qdict: Add qdict_stringify_for_keyval(), Max Reitz, 2018/05/09
[Qemu-devel] [PATCH 08/13] tests: Add qdict_stringify_for_keyval() test, Max Reitz, 2018/05/09