Replace more cases of /system with /machine

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

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

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 7311489d1d4346b8a20e1962f59d17e9eaa42692..4a661da44563e3a3b970e20a6fc36c30b286371e 100644 (file)
--- 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 3a58f24e03db5295a6bf2fa0675253d04f07c663..891984a5b15299a2df92522225818f64f8db9b2d 100644 (file)
--- 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) {