External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

vircgroup: extract virCgroupV1StealPlacement

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-17 12:00:29 +02:00
parent b549a66edf
commit 12264c12c8
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/vircgroup.c
View File

@ -1319,8 +1319,7 @@ virCgroupNewMachineSystemd(const char *name,
&init) < 0) &init) < 0)
return -1; return -1;
path = init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement; path = init->backend->stealPlacement(init);
init->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement = NULL;
virCgroupFree(&init); virCgroupFree(&init);
if (!path || STREQ(path, "/") || path[0] != '/') { if (!path || STREQ(path, "/") || path[0] != '/') {

4
src/util/vircgroupbackend.h
View File

@ -66,6 +66,9 @@ typedef int
(*virCgroupValidatePlacementCB)(virCgroupPtr group, (*virCgroupValidatePlacementCB)(virCgroupPtr group,
pid_t pid); pid_t pid);
typedef char *
(*virCgroupStealPlacementCB)(virCgroupPtr group);
struct _virCgroupBackend { struct _virCgroupBackend {
virCgroupBackendType type; virCgroupBackendType type;
@ -77,6 +80,7 @@ struct _virCgroupBackend {
virCgroupDetectMountsCB detectMounts; virCgroupDetectMountsCB detectMounts;
virCgroupDetectPlacementCB detectPlacement; virCgroupDetectPlacementCB detectPlacement;
virCgroupValidatePlacementCB validatePlacement; virCgroupValidatePlacementCB validatePlacement;
virCgroupStealPlacementCB stealPlacement;
}; };
typedef struct _virCgroupBackend virCgroupBackend; typedef struct _virCgroupBackend virCgroupBackend;
typedef virCgroupBackend *virCgroupBackendPtr; typedef virCgroupBackend *virCgroupBackendPtr;

12
src/util/vircgroupv1.c
View File

@ -402,6 +402,17 @@ virCgroupV1ValidatePlacement(virCgroupPtr group,
} }
static char *
virCgroupV1StealPlacement(virCgroupPtr group)
{
char *ret = NULL;
VIR_STEAL_PTR(ret, group->controllers[VIR_CGROUP_CONTROLLER_SYSTEMD].placement);
return ret;
}
virCgroupBackend virCgroupV1Backend = { virCgroupBackend virCgroupV1Backend = {
.type = VIR_CGROUP_BACKEND_TYPE_V1, .type = VIR_CGROUP_BACKEND_TYPE_V1,
@ -412,6 +423,7 @@ virCgroupBackend virCgroupV1Backend = {
.detectMounts = virCgroupV1DetectMounts, .detectMounts = virCgroupV1DetectMounts,
.detectPlacement = virCgroupV1DetectPlacement, .detectPlacement = virCgroupV1DetectPlacement,
.validatePlacement = virCgroupV1ValidatePlacement, .validatePlacement = virCgroupV1ValidatePlacement,
.stealPlacement = virCgroupV1StealPlacement,
}; };