]> xenbits.xensource.com Git - libvirt.git/commitdiff
nodeinfo: Remove libnuma include
authorPeter Krempa <pkrempa@redhat.com>
Fri, 18 Oct 2013 14:42:38 +0000 (16:42 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 4 Nov 2013 09:50:20 +0000 (10:50 +0100)
Now that all libnuma functions used by libvirt are wrapped in virNuma we
can remove the dependancy from nodeinfo.

src/nodeinfo.c

index d1242411e02a2f34dd77973d04ddba18fc13b765..6c1fcc707705fd55813b6836d94cb2e2d4c78bdd 100644 (file)
 #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>
@@ -1534,7 +1529,6 @@ nodeGetFreeMemoryFake(void)
     return ret;
 }
 
-#if WITH_NUMACTL
 static virBitmapPtr
 virNodeGetSiblingsList(const char *dir, int cpu_id)
 {
@@ -1715,23 +1709,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