You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/02/01 08:52:48 UTC

[cloudstack] branch 4.14 updated: kvm: Use Q35 chipset for UEFI x86_64 (#4576)

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.14 by this push:
     new e9dda98  kvm: Use Q35 chipset for UEFI x86_64 (#4576)
e9dda98 is described below

commit e9dda98a87dc6c305f7b1dac35f3fe2106609dc8
Author: jairov4 <19...@users.noreply.github.com>
AuthorDate: Mon Feb 1 03:52:29 2021 -0500

    kvm: Use Q35 chipset for UEFI x86_64 (#4576)
    
    Fix #4245
    
    This PR uses Q35 chipset for UEFI in x86_64.
    Currently this mistakenly only enabled for secure boot
---
 .../com/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 efda1a2..8fe8449 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
@@ -2247,8 +2247,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
         if (MapUtils.isNotEmpty(customParams) && customParams.containsKey(GuestDef.BootType.UEFI.toString())) {
             guest.setBootType(GuestDef.BootType.UEFI);
             guest.setBootMode(GuestDef.BootMode.LEGACY);
+            guest.setMachineType("q35");
             if (StringUtils.isNotBlank(customParams.get(GuestDef.BootType.UEFI.toString())) && "secure".equalsIgnoreCase(customParams.get(GuestDef.BootType.UEFI.toString()))) {
-                guest.setMachineType("q35");
                 guest.setBootMode(GuestDef.BootMode.SECURE); // setting to secure mode
             }
         }