openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vircgroup: Extract controller detection into 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 16:14:12 +02:00
parent 4b2fb60777
commit bddf975c76
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/util/vircgroup.c
View File

@ -631,24 +631,11 @@ virCgroupDetectPlacement(virCgroupPtr group,
static int static int
virCgroupDetect(virCgroupPtr group, virCgroupDetectControllers(virCgroupPtr group,
pid_t pid, int controllers)
int controllers,
const char *path,
virCgroupPtr parent)
{ {
size_t i; size_t i;
size_t j; size_t j;
VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",
group, controllers, path, parent);
if (parent) {
if (virCgroupCopyMounts(group, parent) < 0)
return -1;
} else {
if (virCgroupDetectMounts(group) < 0)
return -1;
}
if (controllers >= 0) { if (controllers >= 0) {
VIR_DEBUG("Filtering controllers %d", controllers); VIR_DEBUG("Filtering controllers %d", controllers);
@ -703,8 +690,37 @@ virCgroupDetect(virCgroupPtr group,
} }
} }
return controllers;
}
static int
virCgroupDetect(virCgroupPtr group,
pid_t pid,
int controllers,
const char *path,
virCgroupPtr parent)
{
size_t i;
int rc;
VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",
group, controllers, path, parent);
if (parent) {
if (virCgroupCopyMounts(group, parent) < 0)
return -1;
} else {
if (virCgroupDetectMounts(group) < 0)
return -1;
}
rc = virCgroupDetectControllers(group, controllers);
if (rc < 0)
return -1;
/* Check that at least 1 controller is available */ /* Check that at least 1 controller is available */
if (!controllers) { if (rc == 0) {
virReportSystemError(ENXIO, "%s", virReportSystemError(ENXIO, "%s",
_("At least one cgroup controller is required")); _("At least one cgroup controller is required"));
return -1; return -1;