render / rpms / libvirt

Forked from rpms/libvirt 10 months ago
Clone
Blob Blame History Raw
From a5699adc79fcb10b45993a3208f90e1ddb10c352 Mon Sep 17 00:00:00 2001
Message-Id: <a5699adc79fcb10b45993a3208f90e1ddb10c352.1390394207.git.jdenemar@redhat.com>
From: Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
Date: Mon, 20 Jan 2014 09:03:27 -0700
Subject: [PATCH] AArch64: Parse cputopology from /proc/cpuinfo.

https://bugzilla.redhat.com/show_bug.cgi?id=1042937

CPU "parser" for AArch64.
Showing cputopology in arm64 linux is work-in-progress so for now
all AArch64 cpus belong to same socket (like PPC).

Also we parse BogoMIPS same like arm 32bit.

Signed-off-by: Anup Patel <anup.patel@linaro.org>
Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
(cherry picked from commit 950127620dc503d94d4fa56b81fa75378f5bbf4e)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/nodeinfo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 33a79b7..3bea9b8 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -205,7 +205,8 @@ virNodeParseSocket(const char *dir, unsigned int cpu)
 # if defined(__powerpc__) || \
     defined(__powerpc64__) || \
     defined(__s390__) || \
-    defined(__s390x__)
+    defined(__s390x__) || \
+    defined(__aarch64__)
     /* ppc and s390(x) has -1 */
     if (ret < 0)
         ret = 0;
@@ -441,7 +442,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
              * and parsed in next iteration, because it is not in expected
              * format and thus lead to error. */
         }
-# elif defined(__arm__)
+# elif defined(__arm__) || defined(__aarch64__)
         char *buf = line;
         if (STRPREFIX(buf, "BogoMIPS")) {
             char *p;
-- 
1.8.5.3