[libvirt] [PATCH] nodeinfo: fix build on FreeBSD

Martin Kletzander mkletzan at redhat.com
Mon Jul 20 09:43:08 UTC 2015


On Fri, Jul 17, 2015 at 08:23:07PM +0300, Roman Bogorodskiy wrote:
>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 | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>

ACK, can't hurt, could've been considered under build-breaker rule.

>diff --git a/src/nodeinfo.c b/src/nodeinfo.c
>index c874fa6..d7d0223 100644
>--- a/src/nodeinfo.c
>+++ b/src/nodeinfo.c
>@@ -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"
>--
>2.4.5
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150720/0f3ab8b2/attachment-0001.sig>


More information about the libvir-list mailing list