From 0a488720d9702ccedf9e37f639772f67e0180d33 Mon Sep 17 00:00:00 2001
Message-Id: <0a488720d9702ccedf9e37f639772f67e0180d33@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 1 Jul 2019 17:05:54 +0200
Subject: [PATCH] vircgroup: Move function used in tests into vircgrouppriv.h
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 8ea2d5a6cbe9d14f30ffb8dbe0922945f0f490cb)

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

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

diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
index 138bb3c076..48be077aba 100644
--- a/src/util/vircgroup.h
+++ b/src/util/vircgroup.h
@@ -64,22 +64,9 @@ typedef enum {
 
 bool virCgroupAvailable(void);
 
-int virCgroupNewPartition(const char *path,
-                          bool create,
-                          int controllers,
-                          virCgroupPtr *group)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
-
 int virCgroupNewSelf(virCgroupPtr *group)
     ATTRIBUTE_NONNULL(1);
 
-int virCgroupNewDomainPartition(virCgroupPtr partition,
-                                const char *driver,
-                                const char *name,
-                                bool create,
-                                virCgroupPtr *group)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
-
 int virCgroupNewThread(virCgroupPtr domain,
                        virCgroupThreadName nameval,
                        int id,
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
index 1b47d3b858..a0034f3889 100644
--- a/src/util/vircgrouppriv.h
+++ b/src/util/vircgrouppriv.h
@@ -54,4 +54,17 @@ int virCgroupDetectMountsFromFile(virCgroupPtr group,
                                   const char *path,
                                   bool checkLinks);
 
+int virCgroupNewPartition(const char *path,
+                          bool create,
+                          int controllers,
+                          virCgroupPtr *group)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
+
+int virCgroupNewDomainPartition(virCgroupPtr partition,
+                                const char *driver,
+                                const char *name,
+                                bool create,
+                                virCgroupPtr *group)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
+
 #endif /* __VIR_CGROUP_PRIV_H__ */
-- 
2.22.0