From de97283295189f3d953b5b2dbd15deede8aa332a Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 17 Nov 2023 16:09:50 +0100 Subject: [PATCH 1/2] kvm: fix ide controller for rocky/alma vms --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index e239443197d7..e66d5ffe470c 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3979,7 +3979,8 @@ private DiskDef.DiskBus getGuestDiskModel(final String platformEmulator, boolean return DiskDef.DiskBus.SCSI; } else if (platformEmulator.contains("Ubuntu") || StringUtils.startsWithAny(platformEmulator, - "Fedora", "CentOS", "Red Hat Enterprise Linux", "Debian GNU/Linux", "FreeBSD", "Oracle", "Other PV")) { + "Fedora", "CentOS", "Red Hat Enterprise Linux", "Debian GNU/Linux", "FreeBSD", "Oracle", + "Rocky", "AlmaLinux", "Other PV")) { return DiskDef.DiskBus.VIRTIO; } else if (isUefiEnabled && StringUtils.startsWithAny(platformEmulator, "Windows", "Other")) { return DiskDef.DiskBus.SATA; From f8f1f352c8a26d5a2ae7f09de264d0d1a078eba9 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 27 Nov 2023 17:00:55 +0100 Subject: [PATCH 2/2] Update plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java Co-authored-by: dahn --- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index e66d5ffe470c..a34edba7fd01 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3980,7 +3980,7 @@ private DiskDef.DiskBus getGuestDiskModel(final String platformEmulator, boolean } else if (platformEmulator.contains("Ubuntu") || StringUtils.startsWithAny(platformEmulator, "Fedora", "CentOS", "Red Hat Enterprise Linux", "Debian GNU/Linux", "FreeBSD", "Oracle", - "Rocky", "AlmaLinux", "Other PV")) { + "Rocky Linux", "AlmaLinux", "Other PV")) { return DiskDef.DiskBus.VIRTIO; } else if (isUefiEnabled && StringUtils.startsWithAny(platformEmulator, "Windows", "Other")) { return DiskDef.DiskBus.SATA;