On 26.01.2017 11:18, Daniel P. Berrange wrote: > While the crypto layer uses a fixed option name "key-secret", > the upper block layer may have a prefix on the options. e.g. > "luks-key-secret", "aes-key-secret", in order to avoid clashes > between crypto option names & other block option names. To > ensure the crypto layer can report accurate error messages, > we must tell it what option name prefix was used. > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > --- > block/crypto.c | 4 ++-- > block/qcow.c | 7 ++++--- > block/qcow2.c | 15 +++++++++------ > crypto/block-luks.c | 8 ++++++-- > crypto/block-qcow.c | 8 ++++++-- > crypto/block.c | 6 ++++-- > crypto/blockpriv.h | 2 ++ > include/crypto/block.h | 6 +++++- > 8 files changed, 38 insertions(+), 18 deletions(-)
Thanks a lot! Alas I'm afraid tests/test-crypto-block.c will need a couple of changes, too (trivial ones, though, just a couple of NULL parameters). Max
signature.asc
Description: OpenPGP digital signature
