render / rpms / libvirt

Forked from rpms/libvirt 7 months ago
Clone
c313de
From aa699de198c52868d08679176dd8355deb24ef82 Mon Sep 17 00:00:00 2001
c313de
Message-Id: <aa699de198c52868d08679176dd8355deb24ef82@dist-git>
c313de
From: Pavel Hrdina <phrdina@redhat.com>
c313de
Date: Mon, 1 Jul 2019 17:08:19 +0200
c313de
Subject: [PATCH] util: vircgroupv2: enable CPU controller only if it's
c313de
 available
c313de
MIME-Version: 1.0
c313de
Content-Type: text/plain; charset=UTF-8
c313de
Content-Transfer-Encoding: 8bit
c313de
c313de
It might happen that we are not able to enable CPU controller so we
c313de
can enable it for thread sub-cgroups only if it's available in parent
c313de
cgroup.
c313de
c313de
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
(cherry picked from commit f9d1c08557ddb981a0d889200431185a9c4920e0)
c313de
c313de
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
c313de
c313de
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
c313de
Message-Id: <2a13e05dfbbe52f05541c881964ce92709e5d36a.1561993100.git.phrdina@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
---
c313de
 src/util/vircgroupv2.c | 3 ++-
c313de
 1 file changed, 2 insertions(+), 1 deletion(-)
c313de
c313de
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
c313de
index 04cbadd6a6..98d313bf82 100644
c313de
--- a/src/util/vircgroupv2.c
c313de
+++ b/src/util/vircgroupv2.c
c313de
@@ -403,7 +403,8 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
c313de
                 return -1;
c313de
             }
c313de
 
c313de
-            if (virCgroupV2EnableController(parent,
c313de
+            if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPU) &&
c313de
+                virCgroupV2EnableController(parent,
c313de
                                             VIR_CGROUP_CONTROLLER_CPU) < 0) {
c313de
                 return -1;
c313de
             }
c313de
-- 
c313de
2.22.0
c313de