|
 |
c313de |
From b47ae363dedecaf569906aa3a1349f6e32f4b520 Mon Sep 17 00:00:00 2001
|
|
|
c313de |
Message-Id: <b47ae363dedecaf569906aa3a1349f6e32f4b520@dist-git>
|
|
|
c313de |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
Date: Mon, 1 Jul 2019 17:05:48 +0200
|
|
|
c313de |
Subject: [PATCH] vircgroup: Rename structs to start with underscore
|
|
|
c313de |
MIME-Version: 1.0
|
|
|
c313de |
Content-Type: text/plain; charset=UTF-8
|
|
|
c313de |
Content-Transfer-Encoding: 8bit
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
(cherry picked from commit 70dc671a276ba90099bd1c8ba05e450f092244ff)
|
|
|
c313de |
|
|
|
c313de |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
Message-Id: <49ff9517362f541da5580fe9acc132319872e732.1561993099.git.phrdina@redhat.com>
|
|
|
c313de |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c313de |
---
|
|
|
c313de |
src/util/vircgroup.c | 2 +-
|
|
|
c313de |
src/util/vircgroup.h | 4 ++--
|
|
|
c313de |
src/util/vircgrouppriv.h | 6 +++---
|
|
|
c313de |
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
c313de |
|
|
|
c313de |
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
|
|
|
c313de |
index 6bf4e88da1..7602641713 100644
|
|
|
c313de |
--- a/src/util/vircgroup.c
|
|
|
c313de |
+++ b/src/util/vircgroup.c
|
|
|
c313de |
@@ -385,7 +385,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
|
|
|
c313de |
const char *typestr = virCgroupControllerTypeToString(i);
|
|
|
c313de |
int typelen = strlen(typestr);
|
|
|
c313de |
char *tmp = entry.mnt_opts;
|
|
|
c313de |
- struct virCgroupController *controller = &group->controllers[i];
|
|
|
c313de |
+ struct _virCgroupController *controller = &group->controllers[i];
|
|
|
c313de |
while (tmp) {
|
|
|
c313de |
char *next = strchr(tmp, ',');
|
|
|
c313de |
int len;
|
|
|
c313de |
diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
|
|
|
c313de |
index d833927678..cfa69b67cb 100644
|
|
|
c313de |
--- a/src/util/vircgroup.h
|
|
|
c313de |
+++ b/src/util/vircgroup.h
|
|
|
c313de |
@@ -28,8 +28,8 @@
|
|
|
c313de |
# include "virutil.h"
|
|
|
c313de |
# include "virbitmap.h"
|
|
|
c313de |
|
|
|
c313de |
-struct virCgroup;
|
|
|
c313de |
-typedef struct virCgroup *virCgroupPtr;
|
|
|
c313de |
+struct _virCgroup;
|
|
|
c313de |
+typedef struct _virCgroup *virCgroupPtr;
|
|
|
c313de |
|
|
|
c313de |
enum {
|
|
|
c313de |
VIR_CGROUP_CONTROLLER_CPU,
|
|
|
c313de |
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
|
|
|
c313de |
index 722863e5b6..71788639d6 100644
|
|
|
c313de |
--- a/src/util/vircgrouppriv.h
|
|
|
c313de |
+++ b/src/util/vircgrouppriv.h
|
|
|
c313de |
@@ -31,7 +31,7 @@
|
|
|
c313de |
|
|
|
c313de |
# include "vircgroup.h"
|
|
|
c313de |
|
|
|
c313de |
-struct virCgroupController {
|
|
|
c313de |
+struct _virCgroupController {
|
|
|
c313de |
int type;
|
|
|
c313de |
char *mountPoint;
|
|
|
c313de |
/* If mountPoint holds several controllers co-mounted,
|
|
|
c313de |
@@ -42,10 +42,10 @@ struct virCgroupController {
|
|
|
c313de |
char *placement;
|
|
|
c313de |
};
|
|
|
c313de |
|
|
|
c313de |
-struct virCgroup {
|
|
|
c313de |
+struct _virCgroup {
|
|
|
c313de |
char *path;
|
|
|
c313de |
|
|
|
c313de |
- struct virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
|
|
|
c313de |
+ struct _virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];
|
|
|
c313de |
};
|
|
|
c313de |
|
|
|
c313de |
int virCgroupDetectMountsFromFile(virCgroupPtr group,
|
|
|
c313de |
--
|
|
|
c313de |
2.22.0
|
|
|
c313de |
|