From: Pavel Hrdina <phrdina@redhat.com>
Date: Fri, 14 Sep 2018 21:46:42 +0000 (+0200)
Subject: vircgroup: introduce virCgroupV2DetectPlacement
X-Git-Tag: v4.9.0-rc1~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1efcf202e777d32600e90f3176e0357053341533;p=thirdparty%2Flibvirt.git

vircgroup: introduce virCgroupV2DetectPlacement

If the placement was copied from parent or set to absolute path
there is nothing to do, otherwise set the placement based on
process placement from /proc/self/cgroup or /proc/{pid}/cgroup.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index a66ef4e895..84c29cac5a 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -180,6 +180,31 @@ virCgroupV2DetectMounts(virCgroupPtr group,
 }
 
 
+static int
+virCgroupV2DetectPlacement(virCgroupPtr group,
+                           const char *path,
+                           const char *controllers ATTRIBUTE_UNUSED,
+                           const char *selfpath)
+{
+    if (group->unified.placement)
+        return 0;
+
+    /*
+     * selfpath == "/" + path="" -> "/"
+     * selfpath == "/libvirt.service" + path == "" -> "/libvirt.service"
+     * selfpath == "/libvirt.service" + path == "foo" -> "/libvirt.service/foo"
+     */
+    if (virAsprintf(&group->unified.placement,
+                    "%s%s%s", selfpath,
+                    (STREQ(selfpath, "/") ||
+                     STREQ(path, "") ? "" : "/"),
+                    path) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 virCgroupBackend virCgroupV2Backend = {
     .type = VIR_CGROUP_BACKEND_TYPE_V2,
 
@@ -188,6 +213,7 @@ virCgroupBackend virCgroupV2Backend = {
     .copyMounts = virCgroupV2CopyMounts,
     .copyPlacement = virCgroupV2CopyPlacement,
     .detectMounts = virCgroupV2DetectMounts,
+    .detectPlacement = virCgroupV2DetectPlacement,
 };