[libvirt] [PATCH 14/29] Convert HAVE_NUMACTL to WITH_NUMACTL

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- configure.ac | 4 ++-- docs/hacking.html.in | 2 +- src/lxc/lxc_controller.c | 4 ++-- src/nodeinfo.c | 10 +++++----- src/qemu/qemu_process.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 56358b3..5eef7ff 100644 --- a/configure.ac +++ b/configure.ac @@ -1347,10 +1347,10 @@ if test "$with_numad" = "yes"; then fi if test "$with_numactl" = "yes" || test "$with_numad" = "yes"; then 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 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_LIBS]) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index a97dc22..65d0d4a 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -748,7 +748,7 @@ #include &lt;string.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. #endif diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 7e98006..9ab53d3 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -47,7 +47,7 @@ # include <cap-ng.h> #endif -#if HAVE_NUMACTL +#if WITH_NUMACTL # define NUMA_VERSION1_COMPATIBILITY 1 # include <numa.h> #endif @@ -392,7 +392,7 @@ cleanup: return ret; } -#if HAVE_NUMACTL +#if WITH_NUMACTL static int virLXCControllerSetupNUMAPolicy(virLXCControllerPtr ctrl) { nodemask_t mask; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index b2de60f..876e9df 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -33,7 +33,7 @@ #include <sched.h> #include "conf/domain_conf.h" -#if HAVE_NUMACTL +#if WITH_NUMACTL # define NUMA_VERSION1_COMPATIBILITY 1 # include <numa.h> #endif @@ -861,17 +861,17 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } } else { -# if HAVE_NUMACTL +# if WITH_NUMACTL if (numa_available() < 0) { # endif virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("NUMA not supported on this host")); return -1; -# if HAVE_NUMACTL +# if WITH_NUMACTL } # endif -# if HAVE_NUMACTL +# if WITH_NUMACTL if (cellNum > numa_max_node()) { virReportInvalidArg(cellNum, _("cellNum in %s must be less than or equal to %d"), @@ -1182,7 +1182,7 @@ nodeGetMemoryParameters(virConnectPtr conn ATTRIBUTE_UNUSED, #endif } -#if HAVE_NUMACTL +#if WITH_NUMACTL # if LIBNUMA_API_VERSION <= 1 # define NUMA_MAX_N_CPUS 4096 # else diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b6eb342..e9898b7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -40,7 +40,7 @@ #include "qemu_bridge_filter.h" #include "qemu_migration.h" -#if HAVE_NUMACTL +#if WITH_NUMACTL # define NUMA_VERSION1_COMPATIBILITY 1 # include <numa.h> #endif @@ -1702,7 +1702,7 @@ qemuProcessDetectVcpuPIDs(struct qemud_driver *driver, * Set NUMA memory policy for qemu process, to be run between * fork/exec of QEMU only. */ -#if HAVE_NUMACTL +#if WITH_NUMACTL static int qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm, virBitmapPtr nodemask) -- 1.7.11.4