From: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Date: Fri, 22 Jun 2012 11:50:13 +0000 (+0200)
Subject: S390: Fixed core identification for s390
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2abbffec6e9fb2af72a5ef37e2435201ed505aaa;p=libvirt.git

S390: Fixed core identification for s390

For the s390x architecture the sysfs core_id alone is not unique. As a
result it can happen that libvirt thinks there are less host CPUs available
than really present.
Currently, a logical CPU is equivalent to a core for s390x. We therefore
produce a fake core id from the CPU number.

Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
---

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 7eb5ae5463..819f9541b3 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -355,7 +355,13 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
         nodeinfo->cpus++;
 
         /* Parse core */
+# if defined(__s390__) || \
+    defined(__s390x__)
+    /* logical cpu is equivalent to a core on s390 */
+        core = cpu;
+# else
         core = virNodeGetCpuValue(sysfs_cpudir, cpu, "topology/core_id", false);
+# endif
         if (!CPU_ISSET(core, &core_mask)) {
             CPU_SET(core, &core_mask);
             nodeinfo->cores++;