[PATCH REPOST 8/8] storage: Privatize virStoragePoolObj and virStorageVolDefList

[John Ferlan <jferlan@xxxxxxxxxx>]

Move the structures into virstorageobj so that both are known
within virstorageobj.c.

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/conf/storage_conf.h  |  4 ----
 src/conf/virstorageobj.c | 20 ++++++++++++++++++++
 src/conf/virstorageobj.h | 15 ---------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 8ac6796a61..b349783d26 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -75,10 +75,6 @@ struct _virStorageVolDef {
 
 typedef struct _virStorageVolDefList virStorageVolDefList;
 typedef virStorageVolDefList *virStorageVolDefListPtr;
-struct _virStorageVolDefList {
-    size_t count;
-    virStorageVolDefPtr *objs;
-};
 
 VIR_ENUM_DECL(virStorageVol)
 
diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index ff04c9efe4..50dbd7bf4d 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -37,6 +37,26 @@
 VIR_LOG_INIT("conf.virstorageobj");
 
 
+struct _virStorageVolDefList {
+    size_t count;
+    virStorageVolDefPtr *objs;
+};
+
+struct _virStoragePoolObj {
+    virMutex lock;
+
+    char *configFile;
+    char *autostartLink;
+    bool active;
+    bool autostart;
+    unsigned int asyncjobs;
+
+    virStoragePoolDefPtr def;
+    virStoragePoolDefPtr newDef;
+
+    virStorageVolDefList volumes;
+};
+
 virStoragePoolObjPtr
 virStoragePoolObjNew(void)
 {
diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h
index cf7ee06cd1..69e737226b 100644
--- a/src/conf/virstorageobj.h
+++ b/src/conf/virstorageobj.h
@@ -27,21 +27,6 @@
 typedef struct _virStoragePoolObj virStoragePoolObj;
 typedef virStoragePoolObj *virStoragePoolObjPtr;
 
-struct _virStoragePoolObj {
-    virMutex lock;
-
-    char *configFile;
-    char *autostartLink;
-    bool active;
-    bool autostart;
-    unsigned int asyncjobs;
-
-    virStoragePoolDefPtr def;
-    virStoragePoolDefPtr newDef;
-
-    virStorageVolDefList volumes;
-};
-
 typedef struct _virStoragePoolObjList virStoragePoolObjList;
 typedef virStoragePoolObjList *virStoragePoolObjListPtr;
 struct _virStoragePoolObjList {
-- 
2.13.6

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list