c313de
From 0a488720d9702ccedf9e37f639772f67e0180d33 Mon Sep 17 00:00:00 2001
c313de
Message-Id: <0a488720d9702ccedf9e37f639772f67e0180d33@dist-git>
c313de
From: Pavel Hrdina <phrdina@redhat.com>
c313de
Date: Mon, 1 Jul 2019 17:05:54 +0200
c313de
Subject: [PATCH] vircgroup: Move function used in tests into vircgrouppriv.h
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 8ea2d5a6cbe9d14f30ffb8dbe0922945f0f490cb)
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: <2f8afe33e9c7db8173b360eeaac3ae2e2385eda5.1561993099.git.phrdina@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
---
c313de
 src/util/vircgroup.h     | 13 -------------
c313de
 src/util/vircgrouppriv.h | 13 +++++++++++++
c313de
 2 files changed, 13 insertions(+), 13 deletions(-)
c313de
c313de
diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
c313de
index 138bb3c076..48be077aba 100644
c313de
--- a/src/util/vircgroup.h
c313de
+++ b/src/util/vircgroup.h
c313de
@@ -64,22 +64,9 @@ typedef enum {
c313de
 
c313de
 bool virCgroupAvailable(void);
c313de
 
c313de
-int virCgroupNewPartition(const char *path,
c313de
-                          bool create,
c313de
-                          int controllers,
c313de
-                          virCgroupPtr *group)
c313de
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
c313de
-
c313de
 int virCgroupNewSelf(virCgroupPtr *group)
c313de
     ATTRIBUTE_NONNULL(1);
c313de
 
c313de
-int virCgroupNewDomainPartition(virCgroupPtr partition,
c313de
-                                const char *driver,
c313de
-                                const char *name,
c313de
-                                bool create,
c313de
-                                virCgroupPtr *group)
c313de
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
c313de
-
c313de
 int virCgroupNewThread(virCgroupPtr domain,
c313de
                        virCgroupThreadName nameval,
c313de
                        int id,
c313de
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
c313de
index 1b47d3b858..a0034f3889 100644
c313de
--- a/src/util/vircgrouppriv.h
c313de
+++ b/src/util/vircgrouppriv.h
c313de
@@ -54,4 +54,17 @@ int virCgroupDetectMountsFromFile(virCgroupPtr group,
c313de
                                   const char *path,
c313de
                                   bool checkLinks);
c313de
 
c313de
+int virCgroupNewPartition(const char *path,
c313de
+                          bool create,
c313de
+                          int controllers,
c313de
+                          virCgroupPtr *group)
c313de
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
c313de
+
c313de
+int virCgroupNewDomainPartition(virCgroupPtr partition,
c313de
+                                const char *driver,
c313de
+                                const char *name,
c313de
+                                bool create,
c313de
+                                virCgroupPtr *group)
c313de
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
c313de
+
c313de
 #endif /* __VIR_CGROUP_PRIV_H__ */
c313de
-- 
c313de
2.22.0
c313de