From 42de1f81ed13145374a5838459ce068881966e8c Mon Sep 17 00:00:00 2001 From: NuxRo Date: Wed, 27 Apr 2016 10:49:53 +0100 Subject: [PATCH 1/2] CPU socket count reporting correction CPU socket count reporting correction From https://github.com/MissionCriticalCloud/cosmic-plugin-hypervisor-kvm/pull/16 --- .../kvm/resource/LibvirtComputingResource.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 883c8c99429..a15071e83b4 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2625,8 +2625,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv final Connect conn = LibvirtConnection.getConnection(); final NodeInfo hosts = conn.nodeInfo(); speed = getCpuSpeed(hosts); - + + /* + * Some CPUs report a single socket and multiple NUMA cells. + * We need to multiply them to get the correct socket count. + */ cpuSockets = hosts.sockets; + if (hosts.nodes > 0) { + cpuSockets = hosts.sockets * hosts.nodes; + } cpus = hosts.cpus; ram = hosts.memory * 1024L; final LibvirtCapXMLParser parser = new LibvirtCapXMLParser(); From 108b3517afc8a5bd5cb1443fb7dc88a8c71ef168 Mon Sep 17 00:00:00 2001 From: NuxRo Date: Wed, 27 Apr 2016 19:15:02 +0100 Subject: [PATCH 2/2] Remove empty spaces causing the build to fail --- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index a15071e83b4..d8826d9c68e 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2625,7 +2625,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv final Connect conn = LibvirtConnection.getConnection(); final NodeInfo hosts = conn.nodeInfo(); speed = getCpuSpeed(hosts); - + /* * Some CPUs report a single socket and multiple NUMA cells. * We need to multiply them to get the correct socket count.