On 26.01.2017 11:18, Daniel P. Berrange wrote: > This converts the qcow2 driver to make use of the QCryptoBlock > APIs for encrypting image content, using the legacyy QCow2 AES > scheme. > > With this change it is now required to use the QCryptoSecret > object for providing passwords, instead of the current block > password APIs / interactive prompting. > > $QEMU \ > -object secret,id=sec0,filename=/home/berrange/encrypted.pw \ > -drive file=/home/berrange/encrypted.qcow2,aes-key-secret=sec0 > > The test 087 could be simplified since there is no longer a > difference in behaviour when using blockdev_add with encrypted > images for the running vs stopped CPU state. > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > --- > block/qcow2-cluster.c | 47 +---------- > block/qcow2.c | 190 > +++++++++++++++++++++++++++++---------------- > block/qcow2.h | 5 +- > qapi/block-core.json | 8 +- > tests/qemu-iotests/049 | 2 +- > tests/qemu-iotests/049.out | 4 +- > tests/qemu-iotests/082.out | 27 +++++++ > tests/qemu-iotests/087 | 27 +++---- > tests/qemu-iotests/087.out | 12 +-- > tests/qemu-iotests/134 | 18 +++-- > tests/qemu-iotests/134.out | 10 +-- > tests/qemu-iotests/158 | 19 +++-- > tests/qemu-iotests/158.out | 14 +--- > tests/qemu-iotests/common | 10 ++- > 14 files changed, 212 insertions(+), 181 deletions(-)
For the record: Apart from the the issue Berto found (which I didn't even notice in the last version */me whistles*), no objections from my side. Max
signature.asc
Description: OpenPGP digital signature
