On 04/25/2017 10:38 AM, Daniel P. Berrange wrote:
> When integrating the crypto support with qcow/qcow2, we don't
> want to use the bare LUKS option names "hash-alg", "key-secret",
> etc. We want to namespace them "luks-hash-alg", "luks-key-secret"
> so that they don't clash with any general qcow options at a later
> date.
>
> Reviewed-by: Max Reitz <mre...@redhat.com>
> Reviewed-by: Alberto Garcia <be...@igalia.com>
> Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
> ---
> block/crypto.c | 16 ++++++++--------
> block/crypto.h | 40 ++++++++++++++++++++--------------------
> 2 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/block/crypto.c b/block/crypto.c
> index 8205bd8..7edcc49 100644
> --- a/block/crypto.c
> +++ b/block/crypto.c
> @@ -129,7 +129,7 @@ static QemuOptsList block_crypto_runtime_opts_luks = {
> .name = "crypto",
> .head = QTAILQ_HEAD_INITIALIZER(block_crypto_runtime_opts_luks.head),
> .desc = {
> - BLOCK_CRYPTO_OPT_DEF_LUKS_KEY_SECRET,
> + BLOCK_CRYPTO_OPT_DEF_LUKS_KEY_SECRET(""),Is this still needed, given your cover letter said you reworked things to use a nested struct? I'm still not convinced we need the complexity of two different prefixes if we can instead reuse a common structure. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
