[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] 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)

Pushed under the build breaker rule, but is not part of 0.9.9-rc1
as I discovered it after the release.

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 7537918..e0b66f7 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

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel veillard com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]