CPU features for system VMs

Author: bernardodemarco

agent/conf/agent.properties

@@ -213,10 +213,16 @@ hypervisor.type=kvm
 # If null (default), defaults to the VM's OS architecture
 #guest.cpu.arch=
 
-# This param will require CPU features on the CPU section.
-# The features listed in this property must be separated by a blank space (e.g.: vmx vme)
+# Specifies required CPU features for end-user VMs (non-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

@@ -398,14 +398,25 @@ public class AgentProperties{
     public static final Property<String> GUEST_CPU_ARCH = new Property<>("guest.cpu.arch", null, String.class);
 
     /**
-     * This param will require CPU features on the CPU section.<br>
-     * The features listed in this property must be separated by a blank space (see example below).<br>
+     * Specifies required CPU features for end-user VMs (non-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> 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

@@ -860,6 +860,8 @@ protected String getDefaultScriptsDir() {
 
     protected List<String> cpuFeatures;
 
+    protected List<String> systemVmCpuFeatures;
+
     protected enum BridgeType {
         NATIVE, OPENVSWITCH, TUNGSTEN
     }
@@ -1302,15 +1304,8 @@ public boolean configure(final String name, final Map<String, Object> params) th
             params.put("guest.cpu.model", guestCpuModel);
         }
 
-        final String cpuFeatures = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.GUEST_CPU_FEATURES);
-        if (cpuFeatures != null) {
-            this.cpuFeatures = new ArrayList<String>();
-            for (final String feature: cpuFeatures.split(" ")) {
-                if (!feature.isEmpty()) {
-                    this.cpuFeatures.add(feature);
-                }
-            }
-        }
+        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);
 
@@ -1416,6 +1411,22 @@ public boolean configure(final String name, final Map<String, Object> params) th
         return true;
     }
 
+    /**
+     * Parses a string containing whitespace-separated CPU feature names and converts it into a list.
+     *
+     * @param features A string containing whitespace-separated CPU feature names to be parsed.
+     * @return A list of CPU feature strings. Returns an empty list if {@code features} is null.
+     */
+    protected List<String> parseCpuFeatures(String features) {
+        if (features == null) {
+            return new ArrayList<>();
+        }
+
+        return Arrays.stream(features.split(" "))
+                .filter(feature -> !feature.isEmpty())
+                .collect(Collectors.toList());
+    }
+
     /**
      * Gets the ID list of the VMs to set memory balloon stats period.
      * @param conn the Libvirt connection.
@@ -3005,6 +3016,8 @@ private CpuModeDef createCpuModeDef(VirtualMachineTO vmTO, int vcpus) {
         cmd.setModel(cpuModel);
         if (VirtualMachine.Type.User.equals(vmTO.getType())) {
             cmd.setFeatures(cpuFeatures);
+        } else if (vmTO.getType().isUsedBySystem()) {
+            cmd.setFeatures(systemVmCpuFeatures);
         }
         int vCpusInDef = vmTO.getVcpuMaxLimit() == null ? vcpus : vmTO.getVcpuMaxLimit();
         setCpuTopology(cmd, vCpusInDef, vmTO.getDetails());

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java

@@ -6779,4 +6779,20 @@ public void manuallyDeleteUnusedSnapshotFileTestLibvirtSupportingFlagDeleteOnCom
         libvirtComputingResourceSpy.manuallyDeleteUnusedSnapshotFile(true, "");
         Mockito.verify(libvirtComputingResourceSpy, Mockito.never()).deleteIfExists("");
     }
+
+    @Test
+    public void parseCpuFeaturesTestReturnEmptyListWhenFeaturesIsNull() {
+        List<String> cpuFeatures = libvirtComputingResourceSpy.parseCpuFeatures(null);
+        Assert.assertEquals(0, cpuFeatures.size());
+    }
+
+    @Test
+    public void parseCpuFeaturesTestReturnListOfCpuFeaturesAndIgnoreMultipleWhitespacesAlongsideEachOther() {
+        List<String> cpuFeatures = libvirtComputingResourceSpy.parseCpuFeatures("  -mca    mce   -mmx  hle ");
+        Assert.assertEquals(4, cpuFeatures.size());
+        Assert.assertEquals("-mca", cpuFeatures.get(0));
+        Assert.assertEquals("mce", cpuFeatures.get(1));
+        Assert.assertEquals("-mmx", cpuFeatures.get(2));
+        Assert.assertEquals("hle", cpuFeatures.get(3));
+    }
 }