diff --git a/meson.build b/meson.build index bcb978292b..195d7cd784 100644 --- a/meson.build +++ b/meson.build @@ -1239,13 +1239,10 @@ else intl_dep = dependency('', required: false) endif +numactl_version = '2.0.6' numactl_dep = cc.find_library('numa', required: get_option('numactl')) if numactl_dep.found() conf.set('WITH_NUMACTL', 1) - - if cc.has_function('numa_bitmask_isbitset', dependencies: [ numactl_dep ]) - conf.set('WITH_NUMA_BITMASK_ISBITSET', 1) - endif endif openwsman_version = '2.2.3' diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 2872ce3c5e..b8cf8b4510 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -423,7 +423,7 @@ virNumaGetMaxCPUs(void) } -#if WITH_NUMACTL && WITH_NUMA_BITMASK_ISBITSET +#if WITH_NUMACTL /** * virNumaNodeIsAvailable: * @node: node to check @@ -493,7 +493,7 @@ virNumaGetDistances(int node, return 0; } -#else /* !(WITH_NUMACTL && WITH_NUMA_BITMASK_ISBITSET) */ +#else /* !WITH_NUMACTL */ bool virNumaNodeIsAvailable(int node) @@ -518,7 +518,7 @@ virNumaGetDistances(int node G_GNUC_UNUSED, VIR_DEBUG("NUMA distance information isn't available on this host"); return 0; } -#endif /* !(WITH_NUMACTL && WITH_NUMA_BITMASK_ISBITSET) */ +#endif /* !WITH_NUMACTL */ /* currently all the huge page stuff below is linux only */