[libvirt] [PATCH 5/5] util: vircgroupv2: don't error out if enabling controller fails

Pavel Hrdina phrdina at redhat.com
Thu Jun 20 11:25:45 UTC 2019


Currently CPU controller cannot be enabled if there is any real-time
task running and is assigned to non-root cgroup which is the case on
several distributions with graphical environment.

Instead of erroring out treat it as the controller is not available.

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/util/vircgroupv2.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 6eeebe2230..9cc64d64d2 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -425,8 +425,13 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
                 if (i == VIR_CGROUP_CONTROLLER_CPUACCT)
                     continue;
 
-                if (virCgroupV2EnableController(parent, i) < 0)
-                    return -1;
+                if (virCgroupV2EnableController(parent, i) < 0) {
+                    virResetLastError();
+                    VIR_DEBUG("failed to enable '%s' controller, skipping",
+                              virCgroupV2ControllerTypeToString(i));
+                    group->unified.controllers &= ~(1 << i);
+                    continue;
+                }
             }
         }
     }
-- 
2.21.0




More information about the libvir-list mailing list