From: Martin Kletzander <mkletzan@redhat.com>
Date: Mon, 27 Mar 2017 14:16:43 +0000 (+0200)
Subject: virhostcpu: Expose virHostCPUGetOnline on non-Linux
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9c5ac84d76e52b84cf488a69d9e7d10e8eb8330d;p=libvirt.git

virhostcpu: Expose virHostCPUGetOnline on non-Linux

Previously, this function must've been called only on Linux in order
to fail gracefully.  That lead to #ifdef mess in callers, so the
function was redesigned so it failed gracefully on non-existing
files.  However that commit forgot to define the function outside the
__linux__ ifdef, it broke non-Linux builds.

Caused by c67e04e25fa58104e0fae41f5b874a8067557073.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 47f930cdbf..02b9fc8eb9 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -262,24 +262,6 @@ virHostCPUGetCore(unsigned int cpu, unsigned int *core)
     return 0;
 }
 
-int
-virHostCPUGetOnline(unsigned int cpu, bool *online)
-{
-    unsigned int tmp = 0;
-    int ret = virSysfsGetCpuValueUint(cpu, "online", &tmp);
-
-
-    /* If the file is not there, it's online (doesn't support offlining) */
-    if (ret == -2)
-        tmp = 1;
-    else if (ret < 0)
-        return -1;
-
-    *online = tmp;
-
-    return 0;
-}
-
 virBitmapPtr
 virHostCPUGetSiblingsList(unsigned int cpu)
 {
@@ -880,6 +862,23 @@ virHostCPUParseCountLinux(void)
 }
 #endif
 
+int
+virHostCPUGetOnline(unsigned int cpu, bool *online)
+{
+    unsigned int tmp = 0;
+    int ret = virSysfsGetCpuValueUint(cpu, "online", &tmp);
+
+
+    /* If the file is not there, it's online (doesn't support offlining) */
+    if (ret == -2)
+        tmp = 1;
+    else if (ret < 0)
+        return -1;
+
+    *online = tmp;
+
+    return 0;
+}
 
 int
 virHostCPUStatsAssign(virNodeCPUStatsPtr param,