apply guest.cpu.features for system VMs

Author: bernardodemarco

agent/conf/agent.properties

@@ -213,16 +213,11 @@ hypervisor.type=kvm
 # If null (default), defaults to the VM's OS architecture
 #guest.cpu.arch=
 
-# Specifies required CPU features for end-user VMs (non-system VMs).
+# Specifies required CPU features for end-user and system VMs.
 # These features must be present on the host CPU for VM deployment.
 # Multiple features should be separated by whitespace (e.g.: vmx vme).
 #guest.cpu.features=
 
-# Specifies required CPU features for system VMs.
-# These features must be present on the host CPU for VM deployment.
-# Multiple features should be separated by whitespace (e.g.: vmx vme).
-#systemvm.guest.cpu.features=
-
 # Disables memory ballooning on VM guests for overcommit.
 # By default overcommit feature enables balloon and sets currentMemory to a minimum value.
 #vm.memballoon.disable=false

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -425,7 +425,7 @@ public class AgentProperties{
     public static final Property<String> GUEST_CPU_ARCH = new Property<>("guest.cpu.arch", null, String.class);
 
     /**
-     * Specifies required CPU features for end-user VMs (non-system VMs).<br>
+     * Specifies required CPU features for end-user and system VMs.<br>
      * These features must be present on the host CPU for VM deployment.<br>
      * Multiple features should be separated by whitespace (see example below).<br>
      * Possible values: vmx vme <br>
@@ -434,16 +434,6 @@ public class AgentProperties{
      */
     public static final Property<String> GUEST_CPU_FEATURES = new Property<>("guest.cpu.features", null, String.class);
 
-    /**
-     * Specifies required CPU features for system VMs.<br>
-     * These features must be present on the host CPU for VM deployment.<br>
-     * Multiple features should be separated by whitespace (see example below).<br>
-     * Possible values: vmx vme <br>
-     * Data type: String.<br>
-     * Default value: <code>null</code>
-     */
-    public static final Property<String> SYSTEMVM_GUEST_CPU_FEATURES = new Property<>("systemvm.guest.cpu.features", null, String.class);
-
     /**
      * Disables memory ballooning on VM guests for overcommit.<br>
      * By default overcommit feature enables balloon and sets currentMemory to a minimum value.<br>

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -869,8 +869,6 @@ protected String getDefaultScriptsDir() {
 
     protected List<String> cpuFeatures;
 
-    protected List<String> systemVmCpuFeatures;
-
     protected enum BridgeType {
         NATIVE, OPENVSWITCH, TUNGSTEN
     }
@@ -1319,7 +1317,6 @@ public boolean configure(final String name, final Map<String, Object> params) th
         }
 
         this.cpuFeatures = parseCpuFeatures(AgentPropertiesFileHandler.getPropertyValue(AgentProperties.GUEST_CPU_FEATURES));
-        this.systemVmCpuFeatures = parseCpuFeatures(AgentPropertiesFileHandler.getPropertyValue(AgentProperties.SYSTEMVM_GUEST_CPU_FEATURES));
 
         final String[] info = NetUtils.getNetworkParams(privateNic);
 
@@ -3221,11 +3218,7 @@ private CpuModeDef createCpuModeDef(VirtualMachineTO vmTO, int vcpus) {
         String cpuModel = MapUtils.isNotEmpty(details) && details.get(VmDetailConstants.GUEST_CPU_MODEL) != null ? details.get(VmDetailConstants.GUEST_CPU_MODEL) : guestCpuModel;
         cmd.setMode(cpuMode);
         cmd.setModel(cpuModel);
-        if (VirtualMachine.Type.User.equals(vmTO.getType())) {
-            cmd.setFeatures(cpuFeatures);
-        } else if (vmTO.getType().isUsedBySystem()) {
-            cmd.setFeatures(systemVmCpuFeatures);
-        }
+        cmd.setFeatures(cpuFeatures);
         int vCpusInDef = vmTO.getVcpuMaxLimit() == null ? vcpus : vmTO.getVcpuMaxLimit();
         setCpuTopology(cmd, vCpusInDef, vmTO.getDetails());
         return cmd;