virt-host-validate: Check those CGroups that we actually use

Since the introduction of virt-host-validate tool the set of
cgroup controllers we use has changed so the tool is checking for
some cgroups that we don't need (e.g. net_cls, although I doubt
we have ever used that one) and is not checking for those we
actually use (e.g. cpuset).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c
index 48323da3b5a76908046fc702403ab530e93fc076..e604f837ddc8c78fffe803411365241a3aed3c7d 100644 (file)
--- a/tools/virt-host-validate-lxc.c
+++ b/tools/virt-host-validate-lxc.c
@@ -78,19 +78,19 @@ int virHostValidateLXC(void)
                                         "CGROUP_CPUACCT") < 0)
         ret = -1;
 
-    if (virHostValidateCGroupController("LXC", "devices",
+    if (virHostValidateCGroupController("LXC", "cpuset",
                                         VIR_HOST_VALIDATE_FAIL,
-                                        "CGROUP_DEVICE") < 0)
+                                        "CPUSETS") < 0)
         ret = -1;
 
-    if (virHostValidateCGroupController("LXC", "net_cls",
-                                        VIR_HOST_VALIDATE_WARN,
-                                        "NET_CLS_CGROUP") < 0)
+    if (virHostValidateCGroupController("LXC", "devices",
+                                        VIR_HOST_VALIDATE_FAIL,
+                                        "CGROUP_DEVICE") < 0)
         ret = -1;
 
-    if (virHostValidateCGroupController("LXC", "freezer",
-                                        VIR_HOST_VALIDATE_WARN,
-                                        "CGROUP_FREEZER") < 0)
+    if (virHostValidateCGroupController("LXC", "blkio",
+                                        VIR_HOST_VALIDATE_FAIL,
+                                        "BLK_CGROUP") < 0)
         ret = -1;
 
     return ret;

diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c
index 044df65b02cfd74a0c90c8ad508af6d7725afc9a..a9f6c1e1f8f6901ba1cb65979c8534f41d205725 100644 (file)
--- a/tools/virt-host-validate-qemu.c
+++ b/tools/virt-host-validate-qemu.c
@@ -74,14 +74,14 @@ int virHostValidateQEMU(void)
                                         "CGROUP_CPUACCT") < 0)
         ret = -1;
 
-    if (virHostValidateCGroupController("QEMU", "devices",
+    if (virHostValidateCGroupController("QEMU", "cpuset",
                                         VIR_HOST_VALIDATE_WARN,
-                                        "CGROUP_DEVICES") < 0)
+                                        "CPUSETS") < 0)
         ret = -1;
 
-    if (virHostValidateCGroupController("QEMU", "net_cls",
+    if (virHostValidateCGroupController("QEMU", "devices",
                                         VIR_HOST_VALIDATE_WARN,
-                                        "NET_CLS_CGROUP") < 0)
+                                        "CGROUP_DEVICES") < 0)
         ret = -1;
 
     if (virHostValidateCGroupController("QEMU", "blkio",