On 10/18/2013 05:05 PM, Peter Krempa wrote:
> Now that all libnuma functions used by libvirt are wrapped in virNuma we
> can remove the dependancy from nodeinfo.
> ---
> src/nodeinfo.c | 26 --------------------------
> 1 file changed, 26 deletions(-)
>
> diff --git a/src/nodeinfo.c b/src/nodeinfo.c
> index 7e75611..87edf67 100644
> --- a/src/nodeinfo.c
> +++ b/src/nodeinfo.c
> @@ -33,11 +33,6 @@
> #include <sched.h>
> #include "conf/domain_conf.h"
>
> -#if WITH_NUMACTL
> -# define NUMA_VERSION1_COMPATIBILITY 1
> -# include <numa.h>
> -#endif
> -
> #if defined(__FreeBSD__) || defined(__APPLE__)
> # include <sys/types.h>
> # include <sys/sysctl.h>
> @@ -1512,7 +1507,6 @@ nodeGetFreeMemoryFake(void)
> return ret;
> }
>
> -#if WITH_NUMACTL
> static virBitmapPtr
> virNodeGetSiblingsList(const char *dir, int cpu_id)
> {
> @@ -1693,23 +1687,3 @@ nodeGetFreeMemory(void)
>
> return freeMem;
> }
> -
> -
> -#else
> -int nodeCapsInitNUMA(virCapsPtr caps) {
> - return nodeCapsInitNUMAFake(caps);
> -}
> -
> -int nodeGetCellsFreeMemory(unsigned long long *freeMems,
> - int startCell,
> - int maxCells)
> -{
> - return nodeGetCellsFreeMemoryFake(freeMems,
> - startCell, maxCells);
> -}
> -
> -unsigned long long nodeGetFreeMemory(void)
> -{
> - return nodeGetFreeMemoryFake();
> -}
> -#endif
>
This broke the build on FreeBSD:
CC libvirt_driver_la-nodeinfo.lo
nodeinfo.c: In function 'virNodeGetSiblingsList':
nodeinfo.c:1543: error: 'SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX' undeclared
(first use in this function)
nodeinfo.c:1543: error: (Each undeclared identifier is reported only once
nodeinfo.c:1543: error: for each function it appears in.)
cc1: warnings being treated as errors
nodeinfo.c: In function 'virNodeCapsFillCPUInfo':
nodeinfo.c:1562: warning: implicit declaration of function 'virNodeGetCpuValue'
nodeinfo.c:1562: warning: nested extern declaration of 'virNodeGetCpuValue'
[-Wnested-externs]
nodeinfo.c:1562: error: 'SYSFS_CPU_PATH' undeclared (first use in this function)
make[3]: *** [libvirt_driver_la-nodeinfo.lo] Error 1
make[3]: *** Waiting for unfinished jobs....
make[3]: Leaving directory `/root/libvirt2/libvirt/src'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/root/libvirt2/libvirt/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/root/libvirt2/libvirt'
make: *** [all] Error 2
Jan
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list