render / rpms / libvirt

Forked from rpms/libvirt 8 months ago
Clone
c480ed
From 0a488720d9702ccedf9e37f639772f67e0180d33 Mon Sep 17 00:00:00 2001
c480ed
Message-Id: <0a488720d9702ccedf9e37f639772f67e0180d33@dist-git>
c480ed
From: Pavel Hrdina <phrdina@redhat.com>
c480ed
Date: Mon, 1 Jul 2019 17:05:54 +0200
c480ed
Subject: [PATCH] vircgroup: Move function used in tests into vircgrouppriv.h
c480ed
MIME-Version: 1.0
c480ed
Content-Type: text/plain; charset=UTF-8
c480ed
Content-Transfer-Encoding: 8bit
c480ed
c480ed
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
c480ed
(cherry picked from commit 8ea2d5a6cbe9d14f30ffb8dbe0922945f0f490cb)
c480ed
c480ed
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
c480ed
c480ed
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
c480ed
Message-Id: <2f8afe33e9c7db8173b360eeaac3ae2e2385eda5.1561993099.git.phrdina@redhat.com>
c480ed
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c480ed
---
c480ed
 src/util/vircgroup.h     | 13 -------------
c480ed
 src/util/vircgrouppriv.h | 13 +++++++++++++
c480ed
 2 files changed, 13 insertions(+), 13 deletions(-)
c480ed
c480ed
diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
c480ed
index 138bb3c076..48be077aba 100644
c480ed
--- a/src/util/vircgroup.h
c480ed
+++ b/src/util/vircgroup.h
c480ed
@@ -64,22 +64,9 @@ typedef enum {
c480ed
 
c480ed
 bool virCgroupAvailable(void);
c480ed
 
c480ed
-int virCgroupNewPartition(const char *path,
c480ed
-                          bool create,
c480ed
-                          int controllers,
c480ed
-                          virCgroupPtr *group)
c480ed
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
c480ed
-
c480ed
 int virCgroupNewSelf(virCgroupPtr *group)
c480ed
     ATTRIBUTE_NONNULL(1);
c480ed
 
c480ed
-int virCgroupNewDomainPartition(virCgroupPtr partition,
c480ed
-                                const char *driver,
c480ed
-                                const char *name,
c480ed
-                                bool create,
c480ed
-                                virCgroupPtr *group)
c480ed
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
c480ed
-
c480ed
 int virCgroupNewThread(virCgroupPtr domain,
c480ed
                        virCgroupThreadName nameval,
c480ed
                        int id,
c480ed
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h
c480ed
index 1b47d3b858..a0034f3889 100644
c480ed
--- a/src/util/vircgrouppriv.h
c480ed
+++ b/src/util/vircgrouppriv.h
c480ed
@@ -54,4 +54,17 @@ int virCgroupDetectMountsFromFile(virCgroupPtr group,
c480ed
                                   const char *path,
c480ed
                                   bool checkLinks);
c480ed
 
c480ed
+int virCgroupNewPartition(const char *path,
c480ed
+                          bool create,
c480ed
+                          int controllers,
c480ed
+                          virCgroupPtr *group)
c480ed
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
c480ed
+
c480ed
+int virCgroupNewDomainPartition(virCgroupPtr partition,
c480ed
+                                const char *driver,
c480ed
+                                const char *name,
c480ed
+                                bool create,
c480ed
+                                virCgroupPtr *group)
c480ed
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5);
c480ed
+
c480ed
 #endif /* __VIR_CGROUP_PRIV_H__ */
c480ed
-- 
c480ed
2.22.0
c480ed