xen: set vmr.VCPUsMax to minimum of global setting and host cpu cores

weizhouapache · Aug 28, 2023 · dbc0aa7 · dbc0aa7
1 parent 35b6566
commit dbc0aa7
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...s/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/...s/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -1338,7 +1338,12 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS
                 vmr.VCPUsMax = (long)vmSpec.getCpus();
             } else {
                 if (vmSpec.getVcpuMaxLimit() != null) {
-                    vmr.VCPUsMax = (long)vmSpec.getVcpuMaxLimit();
+                    long vcpuMaxLimit = (long) vmSpec.getVcpuMaxLimit();
+                    if (vcpuMaxLimit <= _host.getCpus()) {
+                        vmr.VCPUsMax = vcpuMaxLimit;
+                    } else {
+                        vmr.VCPUsMax = (long) _host.getCpus();
+                    }
                 }
             }
         } else {