External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vircgroup: extract virCgroupV1ValidatePlacement

Browse Source 
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
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-24 15:15:23 +02:00
parent 229a8b5d35
commit b549a66edf
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/util/vircgroup.c
View File

@ -345,36 +345,6 @@ virCgroupDetectPlacement(virCgroupPtr group,
} }
static int
virCgroupValidatePlacement(virCgroupPtr group,
pid_t pid)
{
size_t i;
for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (!group->controllers[i].mountPoint)
continue;
if (!group->controllers[i].placement) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not find placement for controller %s at %s"),
virCgroupControllerTypeToString(i),
group->controllers[i].placement);
return -1;
}
VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",
i,
virCgroupControllerTypeToString(i),
group->controllers[i].mountPoint,
group->controllers[i].placement,
(long long) pid);
}
return 0;
}
static int static int
virCgroupDetectControllers(virCgroupPtr group, virCgroupDetectControllers(virCgroupPtr group,
int controllers) int controllers)
@ -500,7 +470,7 @@ virCgroupDetect(virCgroupPtr group,
return -1; return -1;
/* Check that for every mounted controller, we found our placement */ /* Check that for every mounted controller, we found our placement */
if (virCgroupValidatePlacement(group, pid) < 0) if (group->backend->validatePlacement(group, pid) < 0)
return -1; return -1;
return 0; return 0;

5
src/util/vircgroupbackend.h
View File

@ -62,6 +62,10 @@ typedef int
const char *controllers, const char *controllers,
const char *selfpath); const char *selfpath);
typedef int
(*virCgroupValidatePlacementCB)(virCgroupPtr group,
pid_t pid);
struct _virCgroupBackend { struct _virCgroupBackend {
virCgroupBackendType type; virCgroupBackendType type;
@ -72,6 +76,7 @@ struct _virCgroupBackend {
virCgroupCopyPlacementCB copyPlacement; virCgroupCopyPlacementCB copyPlacement;
virCgroupDetectMountsCB detectMounts; virCgroupDetectMountsCB detectMounts;
virCgroupDetectPlacementCB detectPlacement; virCgroupDetectPlacementCB detectPlacement;
virCgroupValidatePlacementCB validatePlacement;
}; };
typedef struct _virCgroupBackend virCgroupBackend; typedef struct _virCgroupBackend virCgroupBackend;
typedef virCgroupBackend *virCgroupBackendPtr; typedef virCgroupBackend *virCgroupBackendPtr;

31
src/util/vircgroupv1.c
View File

@ -372,6 +372,36 @@ virCgroupV1DetectPlacement(virCgroupPtr group,
} }
static int
virCgroupV1ValidatePlacement(virCgroupPtr group,
pid_t pid)
{
size_t i;
for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (!group->controllers[i].mountPoint)
continue;
if (!group->controllers[i].placement) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not find placement for v1 controller %s at %s"),
virCgroupV1ControllerTypeToString(i),
group->controllers[i].placement);
return -1;
}
VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld",
i,
virCgroupV1ControllerTypeToString(i),
group->controllers[i].mountPoint,
group->controllers[i].placement,
(long long) pid);
}
return 0;
}
virCgroupBackend virCgroupV1Backend = { virCgroupBackend virCgroupV1Backend = {
.type = VIR_CGROUP_BACKEND_TYPE_V1, .type = VIR_CGROUP_BACKEND_TYPE_V1,
@ -381,6 +411,7 @@ virCgroupBackend virCgroupV1Backend = {
.copyPlacement = virCgroupV1CopyPlacement, .copyPlacement = virCgroupV1CopyPlacement,
.detectMounts = virCgroupV1DetectMounts, .detectMounts = virCgroupV1DetectMounts,
.detectPlacement = virCgroupV1DetectPlacement, .detectPlacement = virCgroupV1DetectPlacement,
.validatePlacement = virCgroupV1ValidatePlacement,
}; };