From 069f0994abfc7880b1ca185f19b9d9c41985a758 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 14 Oct 2020 11:12:46 +0200
Subject: [PATCH] vircgroup: introduce virCgroupCopyMounts helper

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/util/vircgroup.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 3db20ed262..a30aec4e5e 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -239,6 +239,23 @@ virCgroupSetBackends(virCgroupPtr group)
 }
 
 
+static int
+virCgroupCopyMounts(virCgroupPtr group,
+                    virCgroupPtr parent)
+{
+    size_t i;
+
+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
+        if (group->backends[i] &&
+            group->backends[i]->copyMounts(group, parent) < 0) {
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+
 /*
  * Process /proc/mounts figuring out what controllers are
  * mounted and where
@@ -375,12 +392,8 @@ virCgroupDetect(virCgroupPtr group,
         return -1;
 
     if (parent) {
-        for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {
-            if (group->backends[i] &&
-                group->backends[i]->copyMounts(group, parent) < 0) {
-                return -1;
-            }
-        }
+        if (virCgroupCopyMounts(group, parent) < 0)
+            return -1;
     } else {
         if (virCgroupDetectMounts(group) < 0)
             return -1;