From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 20 Jul 2015 16:37:21 +0000 (+0200)
Subject: nodeinfo: Introduce linuxGetCPUGlobalPath()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bd87f07c25bcdeaa48219deb7dbd94b5fcd6ca3c;p=libvirt.git

nodeinfo: Introduce linuxGetCPUGlobalPath()

This is just a more generic version of linuxGetCPUPresentPath(),
which is now implemented by calling the new function appropriately.
---

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 2bf611c642..64442563f2 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -959,16 +959,24 @@ linuxNodeGetMemoryStats(FILE *meminfo,
 }
 
 static char *
-linuxGetCPUPresentPath(const char *sysfs_prefix)
+linuxGetCPUGlobalPath(const char *sysfs_prefix,
+                      const char *file)
 {
     const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH;
     char *path = NULL;
 
-    if (virAsprintf(&path, "%s/cpu/present", prefix) < 0)
+    if (virAsprintf(&path, "%s/cpu/%s", prefix, file) < 0)
         return NULL;
+
     return path;
 }
 
+static char *
+linuxGetCPUPresentPath(const char *sysfs_prefix)
+{
+    return linuxGetCPUGlobalPath(sysfs_prefix, "present");
+}
+
 /* Determine the maximum cpu id from a Linux sysfs cpu/present file. */
 static int
 linuxParseCPUmax(const char *path)