Re: [Qemu-block] [PATCH v6 02/18] block: add ability to set a prefix for opt names

[Daniel P. Berrange]

On Wed, Apr 26, 2017 at 08:28:04AM -0500, Eric Blake wrote:
> 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 <address@hidden>
> > Reviewed-by: Alberto Garcia <address@hidden>
> > Signed-off-by: Daniel P. Berrange <address@hidden>
> > ---
> >  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.

Yes, we still need this at the QemuOpts level.  We have the general
purpose luks driver that has opts directly in the top level QAPI block
driver options, vs the qcow2 integration, which now has the encryption
options in a nested struct/union, rather than having an option prefix
in the QAPI member names.

At the QemuOpts level, this mean that the option names have changed
from being 'luks-key-secret', 'aes-key-secret', to be "encrypt.key-secret"

So this change is about letting us provide the "encrypt." prefix for
the QemuOpts. 


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|