storage: Privatize virStoragePoolObj and virStorageVolDefList

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

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 6d60f70545b8ef167e8e4287547248bea5fbefb2..15dfd8becf91ecafb080adf048b45a60de385e87 100644 (file)
--- 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 ff04c9efe49c336e63ddbcde07e9e3efe050b097..50dbd7bf4df487ad69877f464aa8a58712636a7e 100644 (file)
--- 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 cf7ee06cd135ed95570765414386bde25f1dfbe3..69e737226b57ac5cd75c453d4509ecc02e9a8d56 100644 (file)
--- 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 {