maint: add configure checks for BSD CPU affinity

Check for presence of sys/cpuset.h header and cpuset_getaffinity()
in configure instead of just using #ifdef __FreeBSD__ for that code.

diff --git a/configure.ac b/configure.ac
index 3a703750100a16a6dac3b6115b4a690e78ce5c96..1670a4115a40133c8427e554741730a17053ca56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2604,6 +2604,16 @@ AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL],
                 #include <net/if_bridgevar.h>
                ])
 
+# Check for BSD CPU affinity availability
+AC_CHECK_DECLS([cpuset_getaffinity],
+               [AC_DEFINE([HAVE_BSD_CPU_AFFINITY],
+                          [1],
+                          [whether BSD CPU affinity management is available])],
+               [],
+               [#include <sys/param.h>
+                #include <sys/cpuset.h>
+               ])
+
 # Check if we need to look for ifconfig
 if test "$want_ifconfig" = "yes"; then
      AC_PATH_PROG([IFCONFIG_PATH], [ifconfig])

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 827143c38945f3898098288bd6f851a146c18c72..83d0679e76b17f03c3f90ed9d923005bdd62bfb3 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -34,11 +34,14 @@
 
 #ifdef __FreeBSD__
 # include <sys/param.h>
-# include <sys/cpuset.h>
 # include <sys/sysctl.h>
 # include <sys/user.h>
 #endif
 
+#ifdef HAVE_BSD_CPU_AFFINITY
+# include <sys/cpuset.h>
+#endif
+
 #include "viratomic.h"
 #include "virprocess.h"
 #include "virerror.h"
@@ -457,7 +460,7 @@ realloc:
     return 0;
 }
 
-#elif defined(__FreeBSD__)
+#elif defined(HAVE_BSD_CPU_AFFINITY)
 
 int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED,
                           virBitmapPtr map)