diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2017-06-23 17:24:16 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2017-07-11 17:44:56 +0200 |
| commit | c01c214b691d2f9c54a15ea7e486b1750f20fbf8 (patch) | |
| tree | ede8b242b28d2a7177705b5b7ebf52a4427dde87 /block/qcow.c | |
| parent | 788cf9f8c8cbda53843e060540f3e91a060eb744 (diff) | |
| download | qemu-c01c214b691d2f9c54a15ea7e486b1750f20fbf8.tar.gz | |
block: remove all encryption handling APIs
Now that all encryption keys must be provided upfront via
the QCryptoSecret API and associated block driver properties
there is no need for any explicit encryption handling APIs
in the block layer. Encryption can be handled transparently
within the block driver. We only retain an API for querying
whether an image is encrypted or not, since that is a
potentially useful piece of metadata to report to the user.
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170623162419.26068-18-berrange@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/qcow.c')
| -rw-r--r-- | block/qcow.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/block/qcow.c b/block/qcow.c index db0c5a9016..8a24930fbf 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -220,7 +220,13 @@ 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); + ret = -EINVAL; + goto fail; + } } s->cluster_bits = header.cluster_bits; s->cluster_size = 1 << s->cluster_bits; |