[libvirt] [PATCHv2 10/10] nodeinfo: Remove libnuma include

Peter Krempa pkrempa at redhat.com
Fri Oct 18 15:05:50 UTC 2013


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
-- 
1.8.3.2




More information about the libvir-list mailing list