mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-12 13:17:58 +03:00
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>
This commit is contained in:
parent
b333330aa5
commit
02098ac260
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user