NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert HAVE_NUMACTL to WITH_NUMACTL

Browse Source 
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-09-20 13:41:15 +01:00
parent 766ace80d6
commit 6f736c83e5
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1398,10 +1398,10 @@ if test "$with_numad" = "yes"; then
fi fi
if test "$with_numactl" = "yes" || test "$with_numad" = "yes"; then if test "$with_numactl" = "yes" || test "$with_numad" = "yes"; then
NUMACTL_LIBS="-lnuma" NUMACTL_LIBS="-lnuma"
AC_DEFINE_UNQUOTED([HAVE_NUMACTL], 1, [whether numactl-devel is available]) AC_DEFINE_UNQUOTED([WITH_NUMACTL], 1, [whether numactl-devel is available])
fi fi
AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" != "no"]) AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" != "no"])
AM_CONDITIONAL([HAVE_NUMACTL], [test "$with_numad" != "no" || test "$with_numactl" != "no"]) AM_CONDITIONAL([WITH_NUMACTL], [test "$with_numad" != "no" || test "$with_numactl" != "no"])
AC_SUBST([NUMACTL_CFLAGS]) AC_SUBST([NUMACTL_CFLAGS])
AC_SUBST([NUMACTL_LIBS]) AC_SUBST([NUMACTL_LIBS])

2
docs/hacking.html.in
View File

@ -823,7 +823,7 @@
#include &lt;string.h&gt; #include &lt;string.h&gt;
#include &lt;limits.h&gt; #include &lt;limits.h&gt;
#if HAVE_NUMACTL Some system includes aren't supported #if WITH_NUMACTL Some system includes aren't supported
# include &lt;numa.h&gt; everywhere so need these #if guards. # include &lt;numa.h&gt; everywhere so need these #if guards.
#endif #endif

4
src/lxc/lxc_controller.c
View File

@ -46,7 +46,7 @@
# include <cap-ng.h> # include <cap-ng.h>
#endif #endif
#if HAVE_NUMACTL #if WITH_NUMACTL
# define NUMA_VERSION1_COMPATIBILITY 1 # define NUMA_VERSION1_COMPATIBILITY 1
# include <numa.h> # include <numa.h>
#endif #endif
@ -408,7 +408,7 @@ cleanup:
return ret; return ret;
} }
#if HAVE_NUMACTL #if WITH_NUMACTL
static int virLXCControllerSetupNUMAPolicy(virLXCControllerPtr ctrl) static int virLXCControllerSetupNUMAPolicy(virLXCControllerPtr ctrl)
{ {
nodemask_t mask; nodemask_t mask;

10
src/nodeinfo.c
View File

@ -33,7 +33,7 @@
#include <sched.h> #include <sched.h>
#include "conf/domain_conf.h" #include "conf/domain_conf.h"
#if HAVE_NUMACTL #if WITH_NUMACTL
# define NUMA_VERSION1_COMPATIBILITY 1 # define NUMA_VERSION1_COMPATIBILITY 1
# include <numa.h> # include <numa.h>
#endif #endif
@ -986,17 +986,17 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
return -1; return -1;
} }
} else { } else {
# if HAVE_NUMACTL # if WITH_NUMACTL
if (numa_available() < 0) { if (numa_available() < 0) {
# endif # endif
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("NUMA not supported on this host")); "%s", _("NUMA not supported on this host"));
return -1; return -1;
# if HAVE_NUMACTL # if WITH_NUMACTL
} }
# endif # endif
# if HAVE_NUMACTL # if WITH_NUMACTL
if (cellNum > numa_max_node()) { if (cellNum > numa_max_node()) {
virReportInvalidArg(cellNum, virReportInvalidArg(cellNum,
_("cellNum in %s must be less than or equal to %d"), _("cellNum in %s must be less than or equal to %d"),
@ -1459,7 +1459,7 @@ cleanup:
return ret; return ret;
} }
#if HAVE_NUMACTL #if WITH_NUMACTL
# if LIBNUMA_API_VERSION <= 1 # if LIBNUMA_API_VERSION <= 1
# define NUMA_MAX_N_CPUS 4096 # define NUMA_MAX_N_CPUS 4096
# else # else

4
src/qemu/qemu_process.c
View File

@ -45,7 +45,7 @@
#include "qemu_bridge_filter.h" #include "qemu_bridge_filter.h"
#include "qemu_migration.h" #include "qemu_migration.h"
#if HAVE_NUMACTL #if WITH_NUMACTL
# define NUMA_VERSION1_COMPATIBILITY 1 # define NUMA_VERSION1_COMPATIBILITY 1
# include <numa.h> # include <numa.h>
#endif #endif
@ -1839,7 +1839,7 @@ qemuProcessDetectVcpuPIDs(virQEMUDriverPtr driver,
* Set NUMA memory policy for qemu process, to be run between * Set NUMA memory policy for qemu process, to be run between
* fork/exec of QEMU only. * fork/exec of QEMU only.
*/ */
#if HAVE_NUMACTL #if WITH_NUMACTL
static int static int
qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm, qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm,
virBitmapPtr nodemask) virBitmapPtr nodemask)