[libvirt] [PATCH] Replace more cases of /system with /machine

Daniel P. Berrange berrange at redhat.com
Mon Apr 22 16:12:27 UTC 2013


From: "Daniel P. Berrange" <berrange at redhat.com>

The change in commit aed4986322fe77bdf718e31a0587d00f04f3d97a
was incomplete, missing a couple of cases of /system. This
caused failure to start VMs.

Pushed under trivial rule

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 src/lxc/lxc_cgroup.c   | 2 +-
 src/qemu/qemu_cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 7311489..4a661da 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -557,7 +557,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, bool startup)
         /* We only auto-create the default partition. In other
          * cases we expec the sysadmin/app to have done so */
         rc = virCgroupNewPartition(def->resource->partition,
-                                   STREQ(def->resource->partition, "/system"),
+                                   STREQ(def->resource->partition, "/machine"),
                                    -1,
                                    &parent);
         if (rc != 0) {
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 3a58f24..891984a 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -256,7 +256,7 @@ int qemuInitCgroup(virQEMUDriverPtr driver,
         /* We only auto-create the default partition. In other
          * cases we expec the sysadmin/app to have done so */
         rc = virCgroupNewPartition(vm->def->resource->partition,
-                                   STREQ(vm->def->resource->partition, "/system"),
+                                   STREQ(vm->def->resource->partition, "/machine"),
                                    cfg->cgroupControllers,
                                    &parent);
         if (rc != 0) {
-- 
1.8.1.4




More information about the libvir-list mailing list