External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-30 16:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "util: cgroups do not implicitly add task to new machine cgroup"

Browse Source 
This reverts commit 71ce475967b3523882b0e1a0f649fdbea5abf9d5.

Since commit id 'a41c00b47' has been reverted, this no longer is
necessary
This commit is contained in:
John Ferlan 2016-01-14 11:00:25 -05:00
parent f8f6907284
commit d41bd09596
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lxc/lxc_cgroup.c
View File

@ -504,17 +504,6 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def,
&cgroup) < 0 || !cgroup)
goto cleanup;
if (virCgroupAddTask(cgroup, initpid) < 0) {
virErrorPtr saved = virSaveLastError();
virCgroupRemove(cgroup);
virCgroupFree(&cgroup);
if (saved) {
virSetError(saved);
virFreeError(saved);
}
goto cleanup;
}
/* setup control group permissions for user namespace */
if (def->idmap.uidmap) {
if (virCgroupSetOwner(cgroup,

11
src/qemu/qemu_cgroup.c
View File

@ -789,17 +789,6 @@ qemuInitCgroup(virQEMUDriverPtr driver,
goto cleanup;
}
if (virCgroupAddTask(priv->cgroup, vm->pid) < 0) {
virErrorPtr saved = virSaveLastError();
virCgroupRemove(priv->cgroup);
virCgroupFree(&priv->cgroup);
if (saved) {
virSetError(saved);
virFreeError(saved);
}
goto cleanup;
}
done:
ret = 0;
cleanup:

22
src/util/vircgroup.c
View File

@ -1669,6 +1669,16 @@ virCgroupNewMachineSystemd(const char *name,
}
}
if (virCgroupAddTask(*group, pidleader) < 0) {
virErrorPtr saved = virSaveLastError();
virCgroupRemove(*group);
virCgroupFree(group);
if (saved) {
virSetError(saved);
virFreeError(saved);
}
}
ret = 0;
cleanup:
virCgroupFree(&parent);
@ -1691,6 +1701,7 @@ int virCgroupTerminateMachine(const char *name,
static int
virCgroupNewMachineManual(const char *name,
const char *drivername,
pid_t pidleader,
const char *partition,
int controllers,
virCgroupPtr *group)
@ -1716,6 +1727,16 @@ virCgroupNewMachineManual(const char *name,
group) < 0)
goto cleanup;
if (virCgroupAddTask(*group, pidleader) < 0) {
virErrorPtr saved = virSaveLastError();
virCgroupRemove(*group);
virCgroupFree(group);
if (saved) {
virSetError(saved);
virFreeError(saved);
}
}
done:
ret = 0;
@ -1762,6 +1783,7 @@ virCgroupNewMachine(const char *name,
return virCgroupNewMachineManual(name,
drivername,
pidleader,
partition,
controllers,
group);