Re: [Qemu-devel] [PATCH 07/17] qcow2: add a 'keyid' parameter to qcow2 options

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]

On 10/19/2015 09:09 AM, Daniel P. Berrange wrote:
> Add a 'keyid' parameter that refers to the ID of a
> QCryptoSecret instance that provides the encryption key.
> 
> $QEMU \
>     -object secret,id=sec0,filename=/home/berrange/encrypted.pw \
>     -drive file=/home/berrange/encrypted.qcow2,keyid=sec0
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  block/qcow2.c        | 80 +++++++++++++++++++++++++++++++++++++---------------
>  block/qcow2.h        |  1 +
>  qapi/block-core.json |  8 ++++--
>  3 files changed, 64 insertions(+), 25 deletions(-)
> 

> +++ b/qapi/block-core.json
> @@ -1567,7 +1567,7 @@
>  # Driver specific block device options for qcow.
>  #
>  # @keyid:                 #optional ID of the "secret" object providing the
> -#                         AES decryption key.
> +#                         AES decryption key (since 2.5)

Looks like this line...

>  #
>  # Since: 2.5
>  ##
> @@ -1611,6 +1611,9 @@
>  #                         caches. The interval is in seconds. The default value
>  #                         is 0 and it disables this feature (since 2.5)
>  #
> +# @keyid:                 #optional ID of the "secret" object providing the
> +#                         AES decryption key.

...and this line should be swapped.

> +#
>  # Since: 1.7

(For qcow, the entire struct is new so @keyid doesn't need versioning;
for qcow2, the struct existed since 1.7 and we are extending it in 2.5)

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]