Re: [Qemu-block] [PATCH v6 17/18] block: remove all encryption handling APIs

[Alberto Garcia]

On Tue 25 Apr 2017 05:38:57 PM CEST, Daniel P. Berrange wrote:
> @@ -220,7 +220,12 @@ static int qcow_open(BlockDriverState *bs, QDict 
> *options, int flags,
>              goto fail;
>          }
>          bs->encrypted = true;
> -        bs->valid_key = true;
> +    } else {
> +        if (encryptfmt) {
> +            error_setg(errp, "No encryption in image header, but options "
> +                       "specified format '%s'", encryptfmt);
> +            goto fail;
> +        }

You need to set a return value here, else it's undefined.

Berto