NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add 'controllers' arg to virCgroupNewDetect

Browse Source 
When detecting cgroups we must honour any controllers
whitelist the driver may have.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-07-24 17:31:25 +01:00
parent c101b851c1
commit 5ec5a22493
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/lxc_process.c
View File

@ -1190,7 +1190,7 @@ int virLXCProcessStart(virConnectPtr conn,
} }
if (virCgroupNewDetectMachine(vm->def->name, "lxc", if (virCgroupNewDetectMachine(vm->def->name, "lxc",
vm->pid, &priv->cgroup) < 0) vm->pid, -1, &priv->cgroup) < 0)
goto error; goto error;
if (!priv->cgroup) { if (!priv->cgroup) {
@ -1398,7 +1398,7 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm,
goto error; goto error;
if (virCgroupNewDetectMachine(vm->def->name, "lxc", if (virCgroupNewDetectMachine(vm->def->name, "lxc",
vm->pid, &priv->cgroup) < 0) vm->pid, -1, &priv->cgroup) < 0)
goto error; goto error;
if (!priv->cgroup) { if (!priv->cgroup) {

1
src/qemu/qemu_cgroup.c
View File

@ -707,6 +707,7 @@ qemuConnectCgroup(virQEMUDriverPtr driver,
if (virCgroupNewDetectMachine(vm->def->name, if (virCgroupNewDetectMachine(vm->def->name,
"qemu", "qemu",
vm->pid, vm->pid,
cfg->cgroupControllers,
&priv->cgroup) < 0) &priv->cgroup) < 0)
goto cleanup; goto cleanup;

9
src/util/vircgroup.c
View File

@ -1406,7 +1406,7 @@ int virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
*/ */
int virCgroupNewSelf(virCgroupPtr *group) int virCgroupNewSelf(virCgroupPtr *group)
{ {
return virCgroupNewDetect(-1, group); return virCgroupNewDetect(-1, -1, group);
} }
@ -1577,12 +1577,14 @@ int virCgroupNewEmulator(virCgroupPtr domain ATTRIBUTE_UNUSED,
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
int virCgroupNewDetect(pid_t pid, int virCgroupNewDetect(pid_t pid,
int controllers,
virCgroupPtr *group) virCgroupPtr *group)
{ {
return virCgroupNew(pid, "", NULL, -1, group); return virCgroupNew(pid, "", NULL, controllers, group);
} }
#else #else
int virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED, int virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED,
int controllers ATTRIBUTE_UNUSED,
virCgroupPtr *group ATTRIBUTE_UNUSED) virCgroupPtr *group ATTRIBUTE_UNUSED)
{ {
virReportSystemError(ENXIO, "%s", virReportSystemError(ENXIO, "%s",
@ -1597,9 +1599,10 @@ int virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED,
int virCgroupNewDetectMachine(const char *name, int virCgroupNewDetectMachine(const char *name,
const char *drivername, const char *drivername,
pid_t pid, pid_t pid,
int controllers,
virCgroupPtr *group) virCgroupPtr *group)
{ {
if (virCgroupNewDetect(pid, group) < 0) { if (virCgroupNewDetect(pid, controllers, group) < 0) {
if (virCgroupNewIgnoreError()) if (virCgroupNewIgnoreError())
return 0; return 0;
return -1; return -1;

2
src/util/vircgroup.h
View File

@ -76,11 +76,13 @@ int virCgroupNewEmulator(virCgroupPtr domain,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
int virCgroupNewDetect(pid_t pid, int virCgroupNewDetect(pid_t pid,
int controllers,
virCgroupPtr *group); virCgroupPtr *group);
int virCgroupNewDetectMachine(const char *name, int virCgroupNewDetectMachine(const char *name,
const char *drivername, const char *drivername,
pid_t pid, pid_t pid,
int controllers,
virCgroupPtr *group); virCgroupPtr *group);
int virCgroupNewMachine(const char *name, int virCgroupNewMachine(const char *name,