[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 5/8] qapi: Formalize qcow encryption probing
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v3 5/8] qapi: Formalize qcow encryption probing |
Date: |
Wed, 6 Feb 2019 20:55:48 +0100 |
qcow only supports a single encryption (and there is no reason why that
would change in the future), so we can make it the default.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
qapi/block-core.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index abf9af0c4d..8e193fe71f 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2939,8 +2939,9 @@
# Since: 2.10
##
{ 'union': 'BlockdevQcowEncryption',
- 'base': { 'format': 'BlockdevQcowEncryptionFormat' },
+ 'base': { '*format': 'BlockdevQcowEncryptionFormat' },
'discriminator': 'format',
+ 'default-variant': 'aes',
'data': { 'aes': 'QCryptoBlockOptionsQCow' } }
##
--
2.20.1
- Re: [Qemu-block] [PATCH v3 1/8] qapi: Add default-variant for flat unions, (continued)
[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, 2019/02/06
[Qemu-block] [PATCH v3 5/8] qapi: Formalize qcow encryption probing,
Max Reitz <=
[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