vircgroup: extract virCgroupV1DetectControllers

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 3fd7b7b087830584388694c8ed277de4f62a1449..61c62b08c214ced112925b680826661f68d10903 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -345,70 +345,6 @@ virCgroupDetectPlacement(virCgroupPtr group,
 }
 
 
-static int
-virCgroupDetectControllers(virCgroupPtr group,
-                           int controllers)
-{
-    size_t i;
-    size_t j;
-
-    if (controllers >= 0) {
-        VIR_DEBUG("Filtering controllers %d", controllers);
-        /* First mark requested but non-existing controllers to be ignored */
-        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-            if (((1 << i) & controllers)) {
-                /* Remove non-existent controllers  */
-                if (!group->controllers[i].mountPoint) {
-                    VIR_DEBUG("Requested controller '%s' not mounted, ignoring",
-                              virCgroupControllerTypeToString(i));
-                    controllers &= ~(1 << i);
-                }
-            }
-        }
-        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-            VIR_DEBUG("Controller '%s' wanted=%s, mount='%s'",
-                      virCgroupControllerTypeToString(i),
-                      (1 << i) & controllers ? "yes" : "no",
-                      NULLSTR(group->controllers[i].mountPoint));
-            if (!((1 << i) & controllers) &&
-                group->controllers[i].mountPoint) {
-                /* Check whether a request to disable a controller
-                 * clashes with co-mounting of controllers */
-                for (j = 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) {
-                    if (j == i)
-                        continue;
-                    if (!((1 << j) & controllers))
-                        continue;
-
-                    if (STREQ_NULLABLE(group->controllers[i].mountPoint,
-                                       group->controllers[j].mountPoint)) {
-                        virReportSystemError(EINVAL,
-                                             _("Controller '%s' is not wanted, but '%s' is co-mounted"),
-                                             virCgroupControllerTypeToString(i),
-                                             virCgroupControllerTypeToString(j));
-                        return -1;
-                    }
-                }
-                VIR_FREE(group->controllers[i].mountPoint);
-            }
-        }
-    } else {
-        VIR_DEBUG("Auto-detecting controllers");
-        controllers = 0;
-        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
-            VIR_DEBUG("Controller '%s' present=%s",
-                      virCgroupControllerTypeToString(i),
-                      group->controllers[i].mountPoint ? "yes" : "no");
-            if (group->controllers[i].mountPoint == NULL)
-                continue;
-            controllers |= (1 << i);
-        }
-    }
-
-    return controllers;
-}
-
-
 static int
 virCgroupDetect(virCgroupPtr group,
                 pid_t pid,
@@ -447,7 +383,7 @@ virCgroupDetect(virCgroupPtr group,
             return -1;
     }
 
-    rc = virCgroupDetectControllers(group, controllers);
+    rc = group->backend->detectControllers(group, controllers);
     if (rc < 0)
         return -1;
 

diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
index 9c0bd89793dd130fce143f49ba80a4f71b690435..011d1b00daf6f2a334fb2fc83fedfe6758e07c31 100644 (file)
--- a/src/util/vircgroupbackend.h
+++ b/src/util/vircgroupbackend.h
@@ -69,6 +69,10 @@ typedef int
 typedef char *
 (*virCgroupStealPlacementCB)(virCgroupPtr group);
 
+typedef int
+(*virCgroupDetectControllersCB)(virCgroupPtr group,
+                                int controllers);
+
 struct _virCgroupBackend {
     virCgroupBackendType type;
 
@@ -81,6 +85,7 @@ struct _virCgroupBackend {
     virCgroupDetectPlacementCB detectPlacement;
     virCgroupValidatePlacementCB validatePlacement;
     virCgroupStealPlacementCB stealPlacement;
+    virCgroupDetectControllersCB detectControllers;
 };
 typedef struct _virCgroupBackend virCgroupBackend;
 typedef virCgroupBackend *virCgroupBackendPtr;

diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index ba42d10d3c4dbccf2184aed0bff1d748031990ab..9a04cc18188f3c12fe1c40e4483ba0d2025b2e5c 100644 (file)
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -413,6 +413,70 @@ virCgroupV1StealPlacement(virCgroupPtr group)
 }
 
 
+static int
+virCgroupV1DetectControllers(virCgroupPtr group,
+                             int controllers)
+{
+    size_t i;
+    size_t j;
+
+    if (controllers >= 0) {
+        VIR_DEBUG("Filtering controllers %d", controllers);
+        /* First mark requested but non-existing controllers to be ignored */
+        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
+            if (((1 << i) & controllers)) {
+                /* Remove non-existent controllers  */
+                if (!group->controllers[i].mountPoint) {
+                    VIR_DEBUG("Requested controller '%s' not mounted, ignoring",
+                              virCgroupV1ControllerTypeToString(i));
+                    controllers &= ~(1 << i);
+                }
+            }
+        }
+        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
+            VIR_DEBUG("Controller '%s' wanted=%s, mount='%s'",
+                      virCgroupV1ControllerTypeToString(i),
+                      (1 << i) & controllers ? "yes" : "no",
+                      NULLSTR(group->controllers[i].mountPoint));
+            if (!((1 << i) & controllers) &&
+                group->controllers[i].mountPoint) {
+                /* Check whether a request to disable a controller
+                 * clashes with co-mounting of controllers */
+                for (j = 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) {
+                    if (j == i)
+                        continue;
+                    if (!((1 << j) & controllers))
+                        continue;
+
+                    if (STREQ_NULLABLE(group->controllers[i].mountPoint,
+                                       group->controllers[j].mountPoint)) {
+                        virReportSystemError(EINVAL,
+                                             _("V1 controller '%s' is not wanted, but '%s' is co-mounted"),
+                                             virCgroupV1ControllerTypeToString(i),
+                                             virCgroupV1ControllerTypeToString(j));
+                        return -1;
+                    }
+                }
+                VIR_FREE(group->controllers[i].mountPoint);
+            }
+        }
+    } else {
+        VIR_DEBUG("Auto-detecting controllers");
+        controllers = 0;
+        for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
+            VIR_DEBUG("Controller '%s' present=%s",
+                      virCgroupV1ControllerTypeToString(i),
+                      group->controllers[i].mountPoint ? "yes" : "no");
+            if (group->controllers[i].mountPoint == NULL)
+                continue;
+            controllers |= (1 << i);
+        }
+    }
+
+    return controllers;
+}
+
+
 virCgroupBackend virCgroupV1Backend = {
     .type = VIR_CGROUP_BACKEND_TYPE_V1,
 
@@ -424,6 +488,7 @@ virCgroupBackend virCgroupV1Backend = {
     .detectPlacement = virCgroupV1DetectPlacement,
     .validatePlacement = virCgroupV1ValidatePlacement,
     .stealPlacement = virCgroupV1StealPlacement,
+    .detectControllers = virCgroupV1DetectControllers,
 };