From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 14 Oct 2020 09:15:53 +0000 (+0200)
Subject: vircgroup: introduce virCgroupValidatePlacement helper
X-Git-Tag: v6.10.0-rc1~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20da059e183bae376e7f2e29c4b291561978da24;p=thirdparty%2Flibvirt.git

vircgroup: introduce virCgroupValidatePlacement helper

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index b5f38210fb..55fa49a398 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -393,6 +393,23 @@ virCgroupDetectPlacement(virCgroupPtr group,
 }
 
 
+static int
+virCgroupValidatePlacement(virCgroupPtr group,
+                           pid_t pid)
+{
+    size_t i;
+
+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
+        if (group->backends[i] &&
+            group->backends[i]->validatePlacement(group, pid) < 0) {
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+
 static int
 virCgroupDetect(virCgroupPtr group,
                 pid_t pid,
@@ -430,12 +447,8 @@ virCgroupDetect(virCgroupPtr group,
         return -1;
 
     /* Check that for every mounted controller, we found our placement */
-    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-        if (group->backends[i] &&
-            group->backends[i]->validatePlacement(group, pid) < 0) {
-            return -1;
-        }
-    }
+    if (virCgroupValidatePlacement(group, pid) < 0)
+        return -1;
 
     for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
         if (group->backends[i]) {