summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2015-10-12 14:33:04 +0100
committerDaniel P. Berrange <berrange@redhat.com>2015-10-12 14:37:37 +0100
commit09a7a340769d83b74f320a4e561ee4644f669180 (patch)
tree70c1dddabfb10124197517a44d46702dc08a1f94
parent9bf595b1724671332f4e0195ca96a88c1a5dba73 (diff)
downloadlibvirt-09a7a340769d83b74f320a4e561ee4644f669180.tar.gz
virt-host-validate: disable mntent code on Win32
Win32 does not have support for mntent.h header, so the method which uses this must be stubbed out. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-rw-r--r--tools/virt-host-validate-common.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index a88fc56963..dd41fd44ca 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -26,7 +26,9 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/utsname.h>
-#include <mntent.h>
+#ifdef HAVE_MNTENT_H
+# include <mntent.h>
+#endif /* HAVE_MNTENT_H */
#include "virutil.h"
#include "viralloc.h"
@@ -287,6 +289,7 @@ static int virHostValidateCGroupSupport(const char *hvname,
return -1;
}
+#ifdef HAVE_MNTENT_H
static int virHostValidateCGroupMount(const char *hvname,
const char *cg_name,
virHostValidateLevel level)
@@ -324,6 +327,16 @@ static int virHostValidateCGroupMount(const char *hvname,
cg_name, cg_name);
return -1;
}
+#else /* ! HAVE_MNTENT_H */
+static int virHostValidateCGroupMount(const char *hvname,
+ const char *cg_name,
+ virHostValidateLevel level)
+{
+ virHostMsgCheck(hvname, "for cgroup '%s' controller mount-point", cg_name);
+ virHostMsgFail(level, "%s", "This platform does not support cgroups");
+ return -1;
+}
+#endif /* ! HAVE_MNTENT_H */
int virHostValidateCGroupController(const char *hvname,
const char *cg_name,