From b47ae363dedecaf569906aa3a1349f6e32f4b520 Mon Sep 17 00:00:00 2001
Message-Id: <b47ae363dedecaf569906aa3a1349f6e32f4b520@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:05:48 +0200
Subject: [PATCH] vircgroup: Rename structs to start with underscore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
(cherry picked from commit 70dc671a276ba90099bd1c8ba05e450f092244ff)

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

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Message-Id: <49ff9517362f541da5580fe9acc132319872e732.1561993099.git.phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/util/vircgroup.c     | 2 +-
 src/util/vircgroup.h     | 4 ++--
 src/util/vircgrouppriv.h | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 6bf4e88da1..7602641713 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -385,7 +385,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
             const char *typestr = virCgroupControllerTypeToString(i);
             int typelen = strlen(typestr);
             char *tmp = entry.mnt_opts;
-            struct virCgroupController *controller = &group->controllers[i];
+            struct _virCgroupController *controller = &group->controllers[i];
             while (tmp) {
                 char *next = strchr(tmp, ',');
                 int len;
diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
index d833927678..cfa69b67cb 100644
--- a/src/util/vircgroup.h
+++ b/src/util/vircgroup.h
@@ -28,8 +28,8 @@
 # include "virutil.h"
 # include "virbitmap.h"
 
-struct virCgroup;
-typedef struct virCgroup *virCgroupPtr;
+struct _virCgroup;
+typedef struct _virCgroup *virCgroupPtr;
 
 enum {
     VIR_CGROUP_CONTROLLER_CPU,
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
index 722863e5b6..71788639d6 100644
--- a/src/util/vircgrouppriv.h
+++ b/src/util/vircgrouppriv.h
@@ -31,7 +31,7 @@
 
 # include "vircgroup.h"
 
-struct virCgroupController {
+struct _virCgroupController {
     int type;
     char *mountPoint;
     /* If mountPoint holds several controllers co-mounted,
@@ -42,10 +42,10 @@ struct virCgroupController {
     char *placement;
 };
 
-struct virCgroup {
+struct _virCgroup {
     char *path;
 
-    struct virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
+    struct _virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
 };
 
 int virCgroupDetectMountsFromFile(virCgroupPtr group,
-- 
2.22.0