]> xenbits.xensource.com Git - libvirt.git/commitdiff
nodeinfo: fix build on FreeBSD
authorRoman Bogorodskiy <bogorodskiy@gmail.com>
Fri, 17 Jul 2015 17:07:45 +0000 (20:07 +0300)
committerRoman Bogorodskiy <bogorodskiy@gmail.com>
Mon, 20 Jul 2015 11:01:49 +0000 (14:01 +0300)
Currently, build fails on FreeBSD with:

  CC       libvirt_driver_la-nodeinfo.lo
nodeinfo.c:1941:56: error: use of undeclared identifier 'SYSFS_SYSTEM_PATH'
    const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH;
                                                       ^
1 error generated.

This is caused by commit b97b3048 that added sysfs_prefix to
nodeCapsInitNUMA and used SYSFS_CPU_PATH.

Fix it by unconditionally defining SYSFS_CPU_PATH instead of defining it
under #ifdef __linux__.

src/nodeinfo.c

index c874fa6729b3b81ae05c840f2101695639da4cf0..d7d022395ffab1b4d2254111dafca73f435458c9 100644 (file)
@@ -59,6 +59,8 @@
 
 VIR_LOG_INIT("nodeinfo");
 
+#define SYSFS_SYSTEM_PATH "/sys/devices/system"
+
 #if defined(__FreeBSD__) || defined(__APPLE__)
 static int
 appleFreebsdNodeGetCPUCount(void)
@@ -283,7 +285,6 @@ freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params,
 
 #ifdef __linux__
 # define CPUINFO_PATH "/proc/cpuinfo"
-# define SYSFS_SYSTEM_PATH "/sys/devices/system"
 # define PROCSTAT_PATH "/proc/stat"
 # define MEMINFO_PATH "/proc/meminfo"
 # define SYSFS_MEMORY_SHARED_PATH "/sys/kernel/mm/ksm"