From 648fecd5f67da4d118632251365e5dd93d987d3c Mon Sep 17 00:00:00 2001

Message-Id: <648fecd5f67da4d118632251365e5dd93d987d3c@dist-git>

From: Pavel Hrdina <phrdina@redhat.com>

Date: Mon, 1 Jul 2019 17:07:06 +0200

Subject: [PATCH] vircgroup: rename virCgroupController into

 virCgroupV1Controller

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

(cherry picked from commit bebf732cfae2c1786cb92e7ba3217c551543e3a9)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

Message-Id: <4f23fb7e55cf80372867783a87c95cac02653a94.1561993100.git.phrdina@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 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 54e7d6ea9a..0ba8757348 100644

--- a/src/util/vircgroupv1.c

+++ b/src/util/vircgroupv1.c

@@ -225,7 +225,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;

@@ -320,7 +320,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.22.0