Re: [Qemu-block] [PATCH v4 11/18] qcow2: convert QCow2 to use QCryptoBlock for encryption

[Alberto Garcia]

On Fri 10 Feb 2017 06:09:03 PM CET, Daniel P. Berrange wrote:
> @@ -578,6 +582,7 @@ static void read_cache_sizes(BlockDriverState *bs, 
> QemuOpts *opts,
>      }
>  }
>  
> +
>  typedef struct Qcow2ReopenState {
>      Qcow2Cache *l2_table_cache;
>      Qcow2Cache *refcount_block_cache;

I don't know if you wanted add that empty line up there...

> +    switch (s->crypt_method_header) {
> +    case QCOW_CRYPT_NONE:
> +        break;
> +
> +    case QCOW_CRYPT_AES:
> +        r->crypto_opts = block_crypto_open_opts_init(
> +            Q_CRYPTO_BLOCK_FORMAT_QCOW, opts, "aes-", errp);
> +        break;
> +
> +    default:
> +        break;
> +    }
> +    if (s->crypt_method_header && !r->crypto_opts) {
> +        error_setg(errp, "Unsupported encryption method %d",
> +                   s->crypt_method_header);

You cannot set errp here, because it's already set earlier if
block_crypto_open_opts_init() fails.

Berto