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

vircgroup: Split virCgroupPathOfController into two functions

Browse Source 
The case where we need path of any controller is only for internal use
so move it out to a different function.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2018-08-15 17:21:47 +02:00
parent 3ae7b99094
commit 998658bd1e
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/util/vircgroup.c
View File

@ -1772,28 +1772,13 @@ virCgroupHasController(virCgroupPtr cgroup, int controller)
int int
virCgroupPathOfController(virCgroupPtr group, virCgroupPathOfController(virCgroupPtr group,
int controller, unsigned int controller,
const char *key, const char *key,
char **path) char **path)
{ {
if (controller == -1) { if (controller >= VIR_CGROUP_CONTROLLER_LAST) {
size_t i; virReportError(VIR_ERR_INTERNAL_ERROR,
for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { _("Invalid controller id '%d'"), controller);
/* Reject any controller with a placement
* of '/' to avoid doing bad stuff to the root
* cgroup
*/
if (group->controllers[i].mountPoint &&
group->controllers[i].placement &&
STRNEQ(group->controllers[i].placement, "/")) {
controller = i;
break;
}
}
}
if (controller == -1) {
virReportSystemError(ENOSYS, "%s",
_("No controllers are mounted"));
return -1; return -1;
} }
@ -3505,6 +3490,31 @@ virCgroupRemove(virCgroupPtr group)
} }
static int
virCgroupPathOfAnyController(virCgroupPtr group,
const char *name,
char **keypath)
{
size_t i;
for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
/* Reject any controller with a placement
* of '/' to avoid doing bad stuff to the root
* cgroup
*/
if (group->controllers[i].mountPoint &&
group->controllers[i].placement &&
STRNEQ(group->controllers[i].placement, "/")) {
return virCgroupPathOfController(group, i, name, keypath);
}
}
virReportSystemError(ENOSYS, "%s",
_("No controllers are mounted"));
return -1;
}
/* /*
* Returns 1 if some PIDs are killed, 0 if none are killed, or -1 on error * Returns 1 if some PIDs are killed, 0 if none are killed, or -1 on error
*/ */
@ -3519,7 +3529,7 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids)
VIR_DEBUG("group=%p path=%s signum=%d pids=%p", VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
group, group->path, signum, pids); group, group->path, signum, pids);
if (virCgroupPathOfController(group, -1, "tasks", &keypath) < 0) if (virCgroupPathOfAnyController(group, "tasks", &keypath) < 0)
return -1; return -1;
/* PIDs may be forking as we kill them, so loop /* PIDs may be forking as we kill them, so loop
@ -3622,7 +3632,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group,
VIR_DEBUG("group=%p path=%s signum=%d pids=%p", VIR_DEBUG("group=%p path=%s signum=%d pids=%p",
group, group->path, signum, pids); group, group->path, signum, pids);
if (virCgroupPathOfController(group, -1, "", &keypath) < 0) if (virCgroupPathOfAnyController(group, "", &keypath) < 0)
return -1; return -1;
if ((rc = virCgroupKillInternal(group, signum, pids)) < 0) if ((rc = virCgroupKillInternal(group, signum, pids)) < 0)
@ -4180,7 +4190,7 @@ virCgroupHasController(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
int int
virCgroupPathOfController(virCgroupPtr group ATTRIBUTE_UNUSED, virCgroupPathOfController(virCgroupPtr group ATTRIBUTE_UNUSED,
int controller ATTRIBUTE_UNUSED, unsigned int controller ATTRIBUTE_UNUSED,
const char *key ATTRIBUTE_UNUSED, const char *key ATTRIBUTE_UNUSED,
char **path ATTRIBUTE_UNUSED) char **path ATTRIBUTE_UNUSED)
{ {

2
src/util/vircgroup.h
View File

@ -114,7 +114,7 @@ void virCgroupFree(virCgroupPtr *group);
bool virCgroupHasController(virCgroupPtr cgroup, int controller); bool virCgroupHasController(virCgroupPtr cgroup, int controller);
int virCgroupPathOfController(virCgroupPtr group, int virCgroupPathOfController(virCgroupPtr group,
int controller, unsigned int controller,
const char *key, const char *key,
char **path); char **path);