]> xenbits.xensource.com Git - libvirt.git/commitdiff
util: vircgroupv2: enable CPU controller only if it's available
authorPavel Hrdina <phrdina@redhat.com>
Thu, 20 Jun 2019 11:09:08 +0000 (13:09 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Wed, 26 Jun 2019 11:34:01 +0000 (13:34 +0200)
It might happen that we are not able to enable CPU controller so we
can enable it for thread sub-cgroups only if it's available in parent
cgroup.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/util/vircgroupv2.c

index 6bcbb7e1a0b9a7aa6a9117e2c1bdefdaa6abb21d..3f4548b5324a3457566a6e4a81ec2a30b77d61a1 100644 (file)
@@ -404,7 +404,8 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
                 return -1;
             }
 
-            if (virCgroupV2EnableController(parent,
+            if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPU) &&
+                virCgroupV2EnableController(parent,
                                             VIR_CGROUP_CONTROLLER_CPU) < 0) {
                 return -1;
             }