You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/06/17 15:28:33 UTC
git commit: updated refs/heads/4.3 to 08e571e
Repository: cloudstack
Updated Branches:
refs/heads/4.3 1772fcffc -> 08e571eef
CLOUDSTACK-5891.[VMware] If a template has been registered and "cpu.corespersocket=X" template details have been added for it,
then any instance deployed from that template should have X cores per socket
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08e571ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08e571ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08e571ee
Branch: refs/heads/4.3
Commit: 08e571eefea09beeba4dc7f79651841b724f4303
Parents: 1772fcf
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Nov 26 15:22:58 2013 +0530
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Tue Jun 17 15:28:16 2014 +0200
----------------------------------------------------------------------
.../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08e571ee/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 9f5cf04..be87f12 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2765,6 +2765,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
vmConfigSpec.setCpuHotAddEnabled(vmMo.isCpuHotAddSupported(guestOsId));
configNestedHVSupport(vmMo, vmSpec, vmConfigSpec);
+ // Check for multi-cores per socket settings
+ String coresPerSocket = vmSpec.getDetails().get("cpu.corespersocket");
+ if (coresPerSocket != null) {
+ vmConfigSpec.setNumCoresPerSocket(NumbersUtil.parseInt(coresPerSocket, 1));
+ }
+
VirtualDeviceConfigSpec[] deviceConfigSpecArray = new VirtualDeviceConfigSpec[totalChangeDevices];
int i = 0;
int ideUnitNumber = 0;