From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <rosen644835@gmail.com>
Date: Fri, 1 Nov 2019 17:29:00 +0100
Subject: [PATCH] vircgroup: Ensure /machine group is associated with its
 parent.

Call first virCgroupNew on the parent group virCgroupNewPartition if
it is available on before the creation of the child group.  This
ensures that the creation of a first level group on the unified
architecture, as the check at virCgroupV2ParseControllersFile as the
parent file is there.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233
---
 src/util/vircgroup.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index b46f20abfd..33c61f2d45 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path,
     if (virCgroupSetPartitionSuffix(path, &newPath) < 0)
         goto cleanup;
 
-    if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0)
-        goto cleanup;
-
     if (STRNEQ(newPath, "/")) {
         char *tmp;
         parentPath = g_strdup(newPath);
@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path,
 
         if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0)
             goto cleanup;
+    }
 
+    if (virCgroupNew(-1, newPath, parent, controllers, group) < 0)
+        goto cleanup;
+
+    if (parent) {
         if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0)
             goto cleanup;
     }
-- 
2.23.0

scm'>
<input type='hidden' name='id' value='5fc145ea352104903b7f7eccd1e87768552b1788'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=5fc145ea352104903b7f7eccd1e87768552b1788'>root</a>/<a href='/guix/log/gnu?id=5fc145ea352104903b7f7eccd1e87768552b1788'>gnu</a>/<a href='/guix/log/gnu/packages?id=5fc145ea352104903b7f7eccd1e87768552b1788'>packages</a>/<a href='/guix/log/gnu/packages/clifm.scm?id=5fc145ea352104903b7f7eccd1e87768552b1788'>clifm.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/clifm.scm?id=5fc145ea352104903b7f7eccd1e87768552b1788&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
021-10-31</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=bc5155b952ae8bdbc56aded4d8d39768b4e2a7d4'>Merge remote-tracking branch 'origin/master' into core-updates-frozen</a></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-10-25 19:02:32 +0200'>2021-10-25</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=10208952eaf0834b9cdf341bc75463ed033af315'>environment: Add tests for '--profile'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to a643deac2de81755a1843a3b41dd53857678bebc.

* tests/guix-environment-container.sh, tests/guix-environment.sh: Add
tests for '--profile'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-07-11 00:46:54 +0200'>2021-07-11</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203'>environment: Adjust to earlier 'gcc-bootstrap' search paths changes.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to fe6775f52b7f28a5bf74633ea4737c32a64b7e05.

* tests/guix-environment.sh: Expect C_INCLUDE_PATH rather than CPATH in
environment containing 'gcc-bootstrap'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-01-19 17:45:38 +0100'>2021-01-19</span></td><td><a href='/guix/commit/tests/guix-environment.sh?id=4d79f072cc7b502fc25486d514c9200ba684a596'>environment: Fix '--root' option with relative file name.</a><span class='msg-avail'>...<span class='msg-tooltip'>The path normalization of `--root` option of `guix environment` was
buggy as it appended full argument after normalized directory. This
patch fixes it.

* guix/scripts/environment.scm (register-gc-root): Fix gc-root path
normalization.
* tests/guix-environment.sh: Add test.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>JOULAUD François</td></tr>