Replace more cases of /system with /machine

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

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-22 17:11:11 +01:00
parent 0f35e00135
commit 1e05073fbb
2 changed files with 2 additions and 2 deletions

View File

@ -557,7 +557,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, bool startup)
/* We only auto-create the default partition. In other /* We only auto-create the default partition. In other
* cases we expec the sysadmin/app to have done so */ * cases we expec the sysadmin/app to have done so */
rc = virCgroupNewPartition(def->resource->partition, rc = virCgroupNewPartition(def->resource->partition,
STREQ(def->resource->partition, "/system"), STREQ(def->resource->partition, "/machine"),
-1, -1,
&parent); &parent);
if (rc != 0) { if (rc != 0) {

View File

@ -256,7 +256,7 @@ int qemuInitCgroup(virQEMUDriverPtr driver,
/* We only auto-create the default partition. In other /* We only auto-create the default partition. In other
* cases we expec the sysadmin/app to have done so */ * cases we expec the sysadmin/app to have done so */
rc = virCgroupNewPartition(vm->def->resource->partition, rc = virCgroupNewPartition(vm->def->resource->partition,
STREQ(vm->def->resource->partition, "/system"), STREQ(vm->def->resource->partition, "/machine"),
cfg->cgroupControllers, cfg->cgroupControllers,
&parent); &parent);
if (rc != 0) { if (rc != 0) {