conf: storage: use generic XML namespace types

There is no need to copy and paste the same types pointing
to void all over the place.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index a2b977989f34491c5063e5f2fc8acc55db0a1609..fb8a16a11991134e715dde1474f594a1d16afc2c 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -140,7 +140,7 @@ struct _virStoragePoolOptions {
     int defaultFormat;
     int lastFormat;
 
-    virStoragePoolXMLNamespace ns;
+    virXMLNamespace ns;
 
     virStoragePoolFormatToString formatToString;
     virStoragePoolFormatFromString formatFromString;
@@ -341,7 +341,7 @@ virStoragePoolOptionsForPoolType(int type)
  */
 int
 virStoragePoolOptionsPoolTypeSetXMLNamespace(int type,
-                                             virStoragePoolXMLNamespacePtr ns)
+                                             virXMLNamespacePtr ns)
 {
     int ret = -1;
     virStoragePoolTypeInfoPtr backend = virStoragePoolTypeInfoLookup(type);

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index f399ac6192dac093bd341c146e2fcc7d170966b4..1f62803a9d3cdc9ef33ef7d5f1a38aea6305be80 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -31,28 +31,13 @@
 #include "storage_adapter_conf.h"
 #include "virautoclean.h"
 #include "virenum.h"
+#include "virxml.h"
+
 
-#include <libxml/tree.h>
-
-/* Various callbacks needed to parse/create Storage Pool XML's using
- * a private namespace */
-typedef int (*virStoragePoolDefNamespaceParse)(xmlXPathContextPtr, void **);
-typedef void (*virStoragePoolDefNamespaceFree)(void *);
-typedef int (*virStoragePoolDefNamespaceXMLFormat)(virBufferPtr, void *);
-typedef const char *(*virStoragePoolDefNamespaceHref)(void);
-
-typedef struct _virStoragePoolXMLNamespace virStoragePoolXMLNamespace;
-typedef virStoragePoolXMLNamespace *virStoragePoolXMLNamespacePtr;
-struct _virStoragePoolXMLNamespace {
-    virStoragePoolDefNamespaceParse parse;
-    virStoragePoolDefNamespaceFree free;
-    virStoragePoolDefNamespaceXMLFormat format;
-    virStoragePoolDefNamespaceHref href;
-};
 
 int
 virStoragePoolOptionsPoolTypeSetXMLNamespace(int type,
-                                             virStoragePoolXMLNamespacePtr ns);
+                                             virXMLNamespacePtr ns);
 
 int
 virStoragePoolOptionsFormatPool(virBufferPtr buf,
@@ -277,7 +262,7 @@ struct _virStoragePoolDef {
 
     /* Pool backend specific XML namespace data */
     void *namespaceData;
-    virStoragePoolXMLNamespace ns;
+    virXMLNamespace ns;
 };
 
 typedef struct _virStoragePoolSourceList virStoragePoolSourceList;

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index ae4e9a03a3ebd3f102355a235fb32b961d6b9534..d575b754497a888c4bb62ad122bb27c9ffd5d275 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -701,7 +701,7 @@ virStorageBackend virStorageBackendNetFileSystem = {
     .wipeVol = virStorageBackendVolWipeLocal,
 };
 
-static virStoragePoolXMLNamespace virStoragePoolFSXMLNamespace = {
+static virXMLNamespace virStoragePoolFSXMLNamespace = {
     .parse = virStoragePoolDefFSNamespaceParse,
     .free = virStoragePoolDefFSNamespaceFree,
     .format = virStoragePoolDefFSNamespaceFormatXML,

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index f3104ba31050650f01502977c9a274a50339845b..e490c690f551f35c7ef7dbe6f93351528454dace 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -1542,7 +1542,7 @@ virStorageBackend virStorageBackendRBD = {
 };
 
 
-static virStoragePoolXMLNamespace virStoragePoolRBDXMLNamespace = {
+static virXMLNamespace virStoragePoolRBDXMLNamespace = {
     .parse = virStoragePoolDefRBDNamespaceParse,
     .free = virStoragePoolDefRBDNamespaceFree,
     .format = virStoragePoolDefRBDNamespaceFormatXML,

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 62f857f9eab9a06f8321bae4832c9a8f42a0df78..3dc5ad2969774b1beaf95c759fdb5865287b0969 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -92,7 +92,7 @@ VIR_LOG_INIT("storage.storage_util");
  */
 int
 virStorageBackendNamespaceInit(int poolType,
-                               virStoragePoolXMLNamespacePtr xmlns)
+                               virXMLNamespacePtr xmlns)
 {
     return virStoragePoolOptionsPoolTypeSetXMLNamespace(poolType, xmlns);
 }

diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h
index 6df5928d9be5c4f8c9d2790f31dca3e08a5dfc47..705e23631d0143bbe5672f035396780902351e59 100644 (file)
--- a/src/storage/storage_util.h
+++ b/src/storage/storage_util.h
@@ -36,7 +36,7 @@ struct _virStoragePoolFSMountOptionsDef {
 
 int
 virStorageBackendNamespaceInit(int poolType,
-                               virStoragePoolXMLNamespacePtr xmlns);
+                               virXMLNamespacePtr xmlns);
 
 
 /* File creation/cloning functions used for cloning between backends */