On 2018-06-11 23:02, Eric Blake wrote:
> On 06/11/2018 03:51 PM, Max Reitz wrote:
>> 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 | 44 ++++++++++++++++++++++++++++++++++++++++----
>> block/qcow2.c | 3 +++
>> 2 files changed, 43 insertions(+), 4 deletions(-)
>
>> +##
>> +# @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': { } }
>
> Do we actually need this type, given Anton's work on making omitted
> branches automatically use an empty struct?
>
> https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg06836.htmlLooks like no, we don't. Great! :-) I think I'll still keep part of the comment and move it down into the description of ImageInfoSpecificQCow2Encryption so that anyone who's wondering knows that this value won't appear. Thanks for reviewing and pointing me at it, Max
signature.asc
Description: OpenPGP digital signature
