Re: [libvirt] [PATCH 46/47] vircgroup: rename virCgroupController into virCgroupV1Controller

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt;

--- src/util/vircgrouppriv.h | 8 ++++---- src/util/vircgroupv1.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h index 38c911e8ed..ee6aeedbb5 100644 --- a/src/util/vircgrouppriv.h +++ b/src/util/vircgrouppriv.h @@ -32,7 +32,7 @@ # include "vircgroup.h" # include "vircgroupbackend.h" -struct _virCgroupController { +struct _virCgroupV1Controller { int type; char *mountPoint; /* If mountPoint holds several controllers co-mounted, @@ -42,15 +42,15 @@ struct _virCgroupController { char *linkPoint; char *placement; }; -typedef struct _virCgroupController virCgroupController; -typedef virCgroupController *virCgroupControllerPtr; +typedef struct _virCgroupV1Controller virCgroupV1Controller; +typedef virCgroupV1Controller *virCgroupV1ControllerPtr; struct _virCgroup { char *path; virCgroupBackendPtr backend; - virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST]; + virCgroupV1Controller controllers[VIR_CGROUP_CONTROLLER_LAST]; }; int virCgroupSetValueStr(virCgroupPtr group, diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index be0be0f582..f0f703f811 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -224,7 +224,7 @@ virCgroupV1CopyPlacement(virCgroupPtr group, static int virCgroupV1ResolveMountLink(const char *mntDir, const char *typeStr, - virCgroupControllerPtr controller) + virCgroupV1ControllerPtr controller) { VIR_AUTOFREE(char *) linkSrc = NULL; VIR_AUTOFREE(char *) tmp = NULL; @@ -319,7 +319,7 @@ virCgroupV1DetectMounts(virCgroupPtr group, * once. We need to save the results of the last one, * and we need to be careful to release the memory used * by previous processing. */ - virCgroupControllerPtr controller = &group->controllers[i]; + virCgroupV1ControllerPtr controller = &group->controllers[i]; VIR_FREE(controller->mountPoint); VIR_FREE(controller->linkPoint); -- 2.17.1 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list