From d41bd09596cb6df60bc5157fd8609448203df0c6 Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Thu, 14 Jan 2016 11:00:25 -0500
Subject: [PATCH] Revert "util: cgroups do not implicitly add task to new
 machine cgroup"

This reverts commit 71ce475967b3523882b0e1a0f649fdbea5abf9d5.

Since commit id 'a41c00b47' has been reverted, this no longer is
necessary
---
 src/lxc/lxc_cgroup.c   | 11 -----------
 src/qemu/qemu_cgroup.c | 11 -----------
 src/util/vircgroup.c   | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index ef332e3658..8f78d24b83 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -504,17 +504,6 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def,
                             &cgroup) < 0 || !cgroup)
         goto cleanup;
 
-    if (virCgroupAddTask(cgroup, initpid) < 0) {
-        virErrorPtr saved = virSaveLastError();
-        virCgroupRemove(cgroup);
-        virCgroupFree(&cgroup);
-        if (saved) {
-            virSetError(saved);
-            virFreeError(saved);
-        }
-        goto cleanup;
-    }
-
     /* setup control group permissions for user namespace */
     if (def->idmap.uidmap) {
         if (virCgroupSetOwner(cgroup,
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 88c1ce2cc7..94b931fb48 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -789,17 +789,6 @@ qemuInitCgroup(virQEMUDriverPtr driver,
         goto cleanup;
     }
 
-    if (virCgroupAddTask(priv->cgroup, vm->pid) < 0) {
-        virErrorPtr saved = virSaveLastError();
-        virCgroupRemove(priv->cgroup);
-        virCgroupFree(&priv->cgroup);
-        if (saved) {
-            virSetError(saved);
-            virFreeError(saved);
-        }
-        goto cleanup;
-    }
-
  done:
     ret = 0;
  cleanup:
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 78f519c2c2..7584ee4c24 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1669,6 +1669,16 @@ virCgroupNewMachineSystemd(const char *name,
         }
     }
 
+    if (virCgroupAddTask(*group, pidleader) < 0) {
+        virErrorPtr saved = virSaveLastError();
+        virCgroupRemove(*group);
+        virCgroupFree(group);
+        if (saved) {
+            virSetError(saved);
+            virFreeError(saved);
+        }
+    }
+
     ret = 0;
  cleanup:
     virCgroupFree(&parent);
@@ -1691,6 +1701,7 @@ int virCgroupTerminateMachine(const char *name,
 static int
 virCgroupNewMachineManual(const char *name,
                           const char *drivername,
+                          pid_t pidleader,
                           const char *partition,
                           int controllers,
                           virCgroupPtr *group)
@@ -1716,6 +1727,16 @@ virCgroupNewMachineManual(const char *name,
                                     group) < 0)
         goto cleanup;
 
+    if (virCgroupAddTask(*group, pidleader) < 0) {
+        virErrorPtr saved = virSaveLastError();
+        virCgroupRemove(*group);
+        virCgroupFree(group);
+        if (saved) {
+            virSetError(saved);
+            virFreeError(saved);
+        }
+    }
+
  done:
     ret = 0;
 
@@ -1762,6 +1783,7 @@ virCgroupNewMachine(const char *name,
 
     return virCgroupNewMachineManual(name,
                                      drivername,
+                                     pidleader,
                                      partition,
                                      controllers,
                                      group);