From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 15 Oct 2020 14:59:03 +0000 (+0200)
Subject: vircgroup: no need to use PID in virCgroupEnableMissingControllers
X-Git-Tag: v6.10.0-rc1~360
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c16da281e4087ee23424e9e9c75a1c4694f770ee;p=thirdparty%2Flibvirt.git

vircgroup: no need to use PID in virCgroupEnableMissingControllers

This function is relevant only with cgroups v1 where it creates
hierarchy for controllers that are not managed by systemd. PID is used
to detect a placement of current process but in this situation we are
building the hierarchy for already known placement.

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 81aa3ee791..2c1d6f9f01 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1112,14 +1112,13 @@ virCgroupNewDetectMachine(const char *name,
 
 static int
 virCgroupEnableMissingControllers(char *path,
-                                  pid_t pidleader,
                                   int controllers,
                                   virCgroupPtr *group)
 {
     g_autoptr(virCgroup) parent = NULL;
     char *offset = path;
 
-    if (virCgroupNew(pidleader,
+    if (virCgroupNew(-1,
                      "/",
                      controllers,
                      &parent) < 0)
@@ -1213,10 +1212,8 @@ virCgroupNewMachineSystemd(const char *name,
         return -2;
     }
 
-    if (virCgroupEnableMissingControllers(path, pidleader,
-                                          controllers, &newGroup) < 0) {
+    if (virCgroupEnableMissingControllers(path, controllers, &newGroup) < 0)
         return -1;
-    }
 
     if (virCgroupAddProcess(newGroup, pidleader) < 0) {
         virErrorPtr saved;