You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2014/01/17 06:51:40 UTC
git commit: updated refs/heads/master to 008b029
Updated Branches:
refs/heads/master 0cdf0f6f6 -> 008b029a2
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/008b029a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/008b029a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/008b029a
Branch: refs/heads/master
Commit: 008b029a29460d883ac7d645877e6f4f2945b1e1
Parents: 0cdf0f6
Author: Likitha Shetty <li...@citrix.com>
Authored: Tue Nov 26 15:22:58 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Fri Jan 17 11:00:48 2014 +0530
----------------------------------------------------------------------
.../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/008b029a/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 a2073ea..5d7cf17 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
@@ -2744,6 +2744,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;