On 03/21/2016 08:11 AM, Daniel P. Berrange wrote: > or a couple of releases we have been warning
s/^or/For/ > > Encrypted images are deprecated > Support for them will be removed in a future release. > You can use 'qemu-img convert' to convert your image to an unencrypted one. > > This warning was issued by system emulators, qemu-img, qemu-nbd > and qemu-io. Such a broad warning was issued because the original > intention was to rip out all the code for dealing with encryption > inside the QEMU block layer APIs. > > The new block encryption framework used for the LUKS driver does > not rely on the unloved block layer API for encryption keys, > instead using the QOM 'secret' object type. It is thus no longer > appropriate to warn about encryption unconditionally. > > When the qcow/qcow2 drivers are converted to use the new encryption > framework too, it will be practical to keep AES-CBC support present > for use in qemu-img, qemu-io & qemu-nbd to allow for interoperability > with older QEMU versions and liberation of data from existing encrypted > qcow2 files. > > This change moves the warning out of the generic block code and > into the qcow/qcow2 drivers. Further, the warning is set to only > appear when running the system emulators, since qemu-img, qemu-io, > qemu-nbd are expected to support qcow2 encryption long term now that > the maint burden has been eliminated. > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > --- > block.c | 12 +++++------- > block/qcow.c | 9 +++++++++ > block/qcow2.c | 8 ++++++++ > include/block/block.h | 1 + > tests/qemu-iotests/049.out | 6 ------ > tests/qemu-iotests/087 | 3 ++- > tests/qemu-iotests/087.out | 26 ++++++++------------------ > tests/qemu-iotests/134.out | 18 ------------------ > 8 files changed, 33 insertions(+), 50 deletions(-) > With the typo fix, Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
