gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-02 05:26:35 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

KVM: fix LUKS/volume-encryption detection for qemu-img >= 10.1.0 (#13587)

Browse Source 
qemu-img 10.1.0 changed the "qemu-img --help" supported-formats header
from "Supported formats:" to "Supported image formats:". The regex in
QemuImg.helpSupportsImageFormat() only matched the old header, so
hostSupportsVolumeEncryption() returned false on affected hosts even
though cryptsetup and the luks format were both available, blocking
encrypted offerings.

Make the "image" keyword optional in the regex so it matches both the
legacy and current qemu-img help output.
This commit is contained in:
Nikolaus Eppinger 2026-07-13 09:42:40 +02:00 committed by GitHub
parent 8225668688
commit 63c142be26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java
View File

@ -927,7 +927,10 @@ public class QemuImg {
}
protected static boolean helpSupportsImageFormat(String text, QemuImg.PhysicalDiskFormat format) {
Pattern pattern = Pattern.compile("Supported\\sformats:[a-zA-Z0-9-_\\s]*?\\b" + format + "\\b", CASE_INSENSITIVE);
// QEMU >= 10.1.0 changed the qemu-img --help header from
// "Supported formats:" to "Supported image formats:", so the word
// "image" must be treated as optional here.
Pattern pattern = Pattern.compile("Supported\\s(image\\s)?formats:[a-zA-Z0-9-_\\s]*?\\b" + format + "\\b", CASE_INSENSITIVE);
return pattern.matcher(text).find();
}

15
plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java
View File

@ -390,6 +390,21 @@ public class QemuImgTest {
Assert.assertFalse("should not support http", QemuImg.helpSupportsImageFormat(partialHelp, PhysicalDiskFormat.SHEEPDOG));
}
@Test
public void testHelpSupportsImageFormatQemu101Header() throws QemuImgException, LibvirtException {
// qemu-img 10.1.0 (e.g. RHEL 9.8: qemu-kvm-10.1.0-17.el9_8.3) changed the
// help header from "Supported formats:" to "Supported image formats:"
String help = "Supported image formats:\n" +
" blkdebug blklogwrites blkverify compress copy-before-write copy-on-read\n" +
" file ftp ftps host_cdrom host_device http https io_uring luks nbd null-aio\n" +
" null-co nvme nvme-io_uring preallocate qcow2 quorum raw rbd\n" +
" snapshot-access throttle vdi vhdx virtio-blk-vfio-pci\n" +
" virtio-blk-vhost-user virtio-blk-vhost-vdpa vmdk vpc\n";
Assert.assertTrue("should support luks", QemuImg.helpSupportsImageFormat(help, PhysicalDiskFormat.LUKS));
Assert.assertTrue("should support qcow2", QemuImg.helpSupportsImageFormat(help, PhysicalDiskFormat.QCOW2));
Assert.assertFalse("should not support sheepdog", QemuImg.helpSupportsImageFormat(help, PhysicalDiskFormat.SHEEPDOG));
}
@Test
public void testCheckAndRepair() throws LibvirtException {
String filename = "/tmp/" + UUID.randomUUID() + ".qcow2";