]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Add check for kill() to fix build of cgroups on win32
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 28 Feb 2011 14:13:58 +0000 (14:13 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Mon, 28 Feb 2011 14:13:58 +0000 (14:13 +0000)
The kill() function doesn't exist on Win32, so it needs to be
checked for at build time & code disabled in cgroups

* configure.ac: Check for kill()
* src/util/cgroup.c: Stub out virCGroupKill* functions
  when kill() isn't available

configure.ac
src/util/cgroup.c

index bd509f3a0d7facb4299473d0f23d318e8a901122..a58ee4e3e6395f25e06a81f10f53050440b12138 100644 (file)
@@ -120,7 +120,7 @@ AC_MSG_RESULT([$have_cpuid])
 dnl Availability of various common functions (non-fatal if missing),
 dnl and various less common threadsafe functions
 AC_CHECK_FUNCS_ONCE([cfmakeraw regexec sched_getaffinity getuid getgid \
- initgroups posix_fallocate mmap \
+ initgroups posix_fallocate mmap kill \
  getmntent_r getgrnam_r getpwuid_r])
 
 dnl Availability of pthread functions (if missing, win32 threading is
index 6af3af1c9865be309569dc1a50fe8274f0976f80..c5b8cdd96aecce96c6594e37b4c74201abf43262 100644 (file)
@@ -1307,6 +1307,8 @@ int virCgroupGetFreezerState(virCgroupPtr group, char **state)
                                 "freezer.state", state);
 }
 
+
+#ifdef HAVE_KILL
 static int virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids)
 {
     int rc;
@@ -1520,3 +1522,21 @@ int virCgroupKillPainfully(virCgroupPtr group)
     VIR_DEBUG("Complete %d", rc);
     return rc;
 }
+
+#else /* HAVE_KILL */
+int virCgroupKill(virCgroupPtr group ATTRIBUTE_UNUSED,
+                  int signum ATTRIBUTE_UNUSED)
+{
+    return -ENOSYS;
+}
+int virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED,
+                           int signum ATTRIBUTE_UNUSED)
+{
+    return -ENOSYS;
+}
+
+int virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED)
+{
+    return -ENOSYS;
+}
+#endif /* HAVE_KILL */