From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 22 Jul 2013 15:44:52 +0000 (+0100)
Subject: Convert QEMU driver to use virCgroupNewMachine
X-Git-Tag: v1.1.1-rc2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02098ac260a8f5855bc4f2e24b282dee4a8f8f1b;p=thirdparty%2Flibvirt.git

Convert QEMU driver to use virCgroupNewMachine

Convert the QEMU driver code to use the new atomic API
for setup of cgroups

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 11c9d29f50..bca8630323 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -633,7 +633,6 @@ qemuInitCgroup(virQEMUDriverPtr driver,
 {
     int ret = -1;
     qemuDomainObjPrivatePtr priv = vm->privateData;
-    virCgroupPtr parent = NULL;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
 
     if (!cfg->privileged)
@@ -664,32 +663,26 @@ qemuInitCgroup(virQEMUDriverPtr driver,
                        vm->def->resource->partition);
         goto cleanup;
     }
-    /* We only auto-create the default partition. In other
-     * cases we expect the sysadmin/app to have done so */
-    if (virCgroupNewPartition(vm->def->resource->partition,
-                              STREQ(vm->def->resource->partition, "/machine"),
-                              cfg->cgroupControllers,
-                              &parent) < 0) {
+
+    if (virCgroupNewMachine(vm->def->name,
+                            "qemu",
+                            cfg->privileged,
+                            vm->def->uuid,
+                            NULL,
+                            vm->pid,
+                            false,
+                            vm->def->resource->partition,
+                            cfg->cgroupControllers,
+                            &priv->cgroup) < 0) {
         if (virCgroupNewIgnoreError())
             goto done;
 
         goto cleanup;
     }
 
-    if (virCgroupNewDomainPartition(parent,
-                                    "qemu",
-                                    vm->def->name,
-                                    true,
-                                    &priv->cgroup) < 0)
-        goto cleanup;
-
-    if (virCgroupAddTask(priv->cgroup, vm->pid) < 0)
-        goto cleanup;
-
 done:
     ret = 0;
 cleanup:
-    virCgroupFree(&parent);
     virObjectUnref(cfg);
     return ret;
 }