On Fri, Jun 01, 2018 at 09:52:50PM -0400, Laine Stump wrote:
On 06/01/2018 09:06 PM, Laine Stump wrote:
On 05/21/2018 12:46 PM, Daniel P. Berrangé wrote:
The ability to use qcow legacy encryption is disabled with QEMU for a long time. Switch to using luks encryption, although this is not yet fully wired up in libvirt so the tests still (temporarily) fail.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Laine Stump <laine@laine.org>
(when applied together with patch 08/13, of course :-)
Actually, when I did a complete build/install and tested this, I found that libvirt-tck's self-tests are now failing because the <encryption format='qcow'> element is no longer added to the <disk> in t/070-domain-builder.t and t/100-storage-vol-builder.t.
If you want to squash that change into this patch, that's fine, otherwise you can make a separate patch, or if you don't want to I can.
Yes, I'm squash in a suitable change, which showed a flaw below....
--- lib/Sys/Virt/TCK/DomainBuilder.pm | 4 ++-- lib/Sys/Virt/TCK/StorageVolBuilder.pm | 18 +++++++++++++----- scripts/qemu/100-disk-encryption.t | 2 ++ 3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBuilder.pm index 83cea15..b6adbd3 100644 --- a/lib/Sys/Virt/TCK/DomainBuilder.pm +++ b/lib/Sys/Virt/TCK/DomainBuilder.pm @@ -412,8 +412,8 @@ sub as_xml { $w->emptyTag("target", dev => $disk->{dst}, $disk->{bus} ? (bus => $disk->{bus}) : ()); - if ($disk->{secret}) { - $w->startTag("encryption", format => "qcow"); + if ($disk->{encformat}) {
s/encformat/encryption_format/
+ $w->startTag("encryption", format => $self->{encryption_format});
s/self/disk/
$w->emptyTag("secret", type => "passphrase", uuid => $disk->{secret}); $w->endTag("encryption"); }
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 :|