From 109554d714aa9d29526f8a563556e013c2d7799d Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 3 Apr 2013 18:08:41 +0100
Subject: [PATCH] Cleanup if creating cgroup directories fails

Currently if virCgroupMakeGroup fails, we can get in a situation
where some controllers have been setup, but others not. Ensure
we call virCgroupRemove to remove what we've done upon failure

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 src/util/vircgroup.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 6ff767f27e..cabe2fe612 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1082,8 +1082,10 @@ int virCgroupNewDriver(const char *name,
     rc = virCgroupNew(name, rootgrp, -1, group);
     if (rc == 0) {
         rc = virCgroupMakeGroup(rootgrp, *group, create, VIR_CGROUP_NONE);
-        if (rc != 0)
+        if (rc != 0) {
+            virCgroupRemove(*group);
             virCgroupFree(group);
+        }
     }
 out:
     virCgroupFree(&rootgrp);
@@ -1155,8 +1157,10 @@ int virCgroupNewDomain(virCgroupPtr driver,
          * cumulative usage that we don't need.
          */
         rc = virCgroupMakeGroup(driver, *group, create, VIR_CGROUP_MEM_HIERACHY);
-        if (rc != 0)
+        if (rc != 0) {
+            virCgroupRemove(*group);
             virCgroupFree(group);
+        }
     }
 
     return rc;
@@ -1203,8 +1207,10 @@ int virCgroupNewVcpu(virCgroupPtr domain,
 
     if (rc == 0) {
         rc = virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE);
-        if (rc != 0)
+        if (rc != 0) {
+            virCgroupRemove(*group);
             virCgroupFree(group);
+        }
     }
 
     return rc;
@@ -1244,8 +1250,10 @@ int virCgroupNewEmulator(virCgroupPtr domain,
 
     if (rc == 0) {
         rc = virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE);
-        if (rc != 0)
+        if (rc != 0) {
+            virCgroupRemove(*group);
             virCgroupFree(group);
+        }
     }
 
     return rc;