lxc_fuse: Move virLXCMeminfo struct into lxc_cgroup.h

The function that fills virLXCMeminfo struct
(virLXCCgroupGetMeminfo()) lives in lxc_cgroup.h. Move the struct
there too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h
index 2b323371f9b8f6f764b60605cca7e48bccd596c1..bebdc3ff96cb8c8d7d89884927308cb1e8fb944f 100644 (file)
--- a/src/lxc/lxc_cgroup.h
+++ b/src/lxc/lxc_cgroup.h
@@ -35,6 +35,19 @@ int virLXCCgroupSetup(virDomainDef *def,
                       virCgroup *cgroup,
                       virBitmap *nodemask);
 
+struct virLXCMeminfo {
+    unsigned long long memtotal;
+    unsigned long long memusage;
+    unsigned long long cached;
+    unsigned long long active_anon;
+    unsigned long long inactive_anon;
+    unsigned long long active_file;
+    unsigned long long inactive_file;
+    unsigned long long unevictable;
+    unsigned long long swaptotal;
+    unsigned long long swapusage;
+};
+
 int virLXCCgroupGetMeminfo(struct virLXCMeminfo *meminfo);
 
 int

diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index 34a59667d4fad29ceb6b3cc660bf94297bddf067..7052391a7b705c6dd91baf0ba16623b5a4404dca 100644 (file)
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -28,19 +28,6 @@
 
 #include "lxc_conf.h"
 
-struct virLXCMeminfo {
-    unsigned long long memtotal;
-    unsigned long long memusage;
-    unsigned long long cached;
-    unsigned long long active_anon;
-    unsigned long long inactive_anon;
-    unsigned long long active_file;
-    unsigned long long inactive_file;
-    unsigned long long unevictable;
-    unsigned long long swaptotal;
-    unsigned long long swapusage;
-};
-
 typedef struct virLXCFuse virLXCFuse;
 
 int lxcSetupFuse(struct virLXCFuse **f, virDomainDef *def);