From: Daniel Veillard Date: Fri, 30 Dec 2011 06:15:26 +0000 (+0800) Subject: Fix build on s390(x) and other stange arches X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c4ac050fcb1d7d28bdbeceee7c8c7fda411cc2fc;p=libvirt.git Fix build on s390(x) and other stange arches The blocks to extract node information on a per-arch basis wasn't well balanced leading to a compilation failure if not on one of the handled arches (PCs and PPCs) --- diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 75379183c3..e0b66f7118 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -249,6 +249,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, /* Accept trailing fractional part. */ && (*p == '\0' || *p == '.' || c_isspace(*p))) nodeinfo->mhz = ui; + } # elif defined(__powerpc__) || \ defined(__powerpc64__) if (STRPREFIX(buf, "clock")) { @@ -271,10 +272,10 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * identification and machine, but we don't want it to be caught * and parsed in next iteration, because it is not in expected * format and thus lead to error. */ + } # else # warning Parser for /proc/cpuinfo needs to be adapted for your architecture # endif - } } /* OK, we've parsed clock speed out of /proc/cpuinfo. Get the core, socket