From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 18 Oct 2013 14:42:38 +0000 (+0200)
Subject: nodeinfo: Remove libnuma include
X-Git-Tag: v1.2.0-rc1~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0f854620366bd635d3e37d0b5089c7844cf1395;p=thirdparty%2Flibvirt.git

nodeinfo: Remove libnuma include

Now that all libnuma functions used by libvirt are wrapped in virNuma we
can remove the dependancy from nodeinfo.
---

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index d1242411e0..6c1fcc7077 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>
@@ -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