conf: domain: use generic XML namespace types

Now that virDomainXMLNamespace matches virXMLNamespace,
we no longer need to keep both around.

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

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 51366f8e267ec9c1f3d5dcf7942e445535fbccf5..4924766030468b03fd6d7bf2104cf7767442df55 100644 (file)
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -273,7 +273,7 @@ bhyveDomainDefNamespaceHref(void)
     return "xmlns:bhyve='" BHYVE_NAMESPACE_HREF "'";
 }
 
-virDomainXMLNamespace virBhyveDriverDomainXMLNamespace = {
+virXMLNamespace virBhyveDriverDomainXMLNamespace = {
     .parse = bhyveDomainDefNamespaceParse,
     .free = bhyveDomainDefNamespaceFree,
     .format = bhyveDomainDefNamespaceFormatXML,

diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h
index 17cb283e54a4b1390e7670cfa8c4124dd43eb326..e985278041ba1d665e1e4aaf2607a59ad42ab234 100644 (file)
--- a/src/bhyve/bhyve_domain.h
+++ b/src/bhyve/bhyve_domain.h
@@ -38,6 +38,6 @@ virDomainXMLOptionPtr virBhyveDriverCreateXMLConf(bhyveConnPtr);
 
 extern virDomainXMLPrivateDataCallbacks virBhyveDriverPrivateDataCallbacks;
 extern virDomainDefParserConfig virBhyveDriverDomainDefParserConfig;
-extern virDomainXMLNamespace virBhyveDriverDomainXMLNamespace;
+extern virXMLNamespace virBhyveDriverDomainXMLNamespace;
 
 bool bhyveDomainDefNeedsISAController(virDomainDefPtr def);

diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 41c81ceeb1a044caedd71e118b6eeea44e0d4088..d6a4e79d77b395e1053403e5b1e79240c5e2b478 100644 (file)
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -182,18 +182,6 @@ struct _virCapsStoragePool {
 };
 
 
-typedef int (*virDomainDefNamespaceParse)(xmlXPathContextPtr, void **);
-typedef void (*virDomainDefNamespaceFree)(void *);
-typedef int (*virDomainDefNamespaceXMLFormat)(virBufferPtr, void *);
-typedef const char *(*virDomainDefNamespaceHref)(void);
-
-struct _virDomainXMLNamespace {
-    virDomainDefNamespaceParse parse;
-    virDomainDefNamespaceFree free;
-    virDomainDefNamespaceXMLFormat format;
-    virDomainDefNamespaceHref href;
-};
-
 struct _virCaps {
     virObject parent;
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0d786f53d770346daad65327e2f15b52fcfcec0e..705a5a64df83f637ff0b767ff95d98b702f686fb 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -79,7 +79,7 @@ struct _virDomainXMLOption {
     virDomainXMLPrivateDataCallbacks privateData;
 
     /* XML namespace callbacks */
-    virDomainXMLNamespace ns;
+    virXMLNamespace ns;
 
     /* ABI stability callbacks */
     virDomainABIStability abi;
@@ -1385,7 +1385,7 @@ virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr ctxt)
 virDomainXMLOptionPtr
 virDomainXMLOptionNew(virDomainDefParserConfigPtr config,
                       virDomainXMLPrivateDataCallbacksPtr priv,
-                      virDomainXMLNamespacePtr xmlns,
+                      virXMLNamespacePtr xmlns,
                       virDomainABIStabilityPtr abi,
                       virSaveCookieCallbacksPtr saveCookie)
 {
@@ -1435,7 +1435,7 @@ virDomainXMLOptionNew(virDomainDefParserConfigPtr config,
  * Returns a pointer to the stored namespace structure.
  * The lifetime of the pointer is equal to @xmlopt;
  */
-virDomainXMLNamespacePtr
+virXMLNamespacePtr
 virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt)
 {
     return &xmlopt->ns;

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cbe7b611702edc1d240102d976d430122d38bac6..33cef5b75c89d454f0e4ed25016fb08f8b607362 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2491,7 +2491,7 @@ struct _virDomainDef {
     virDomainVsockDefPtr vsock;
 
     void *namespaceData;
-    virDomainXMLNamespace ns;
+    virXMLNamespace ns;
 
     virDomainKeyWrapDefPtr keywrap;
 
@@ -2731,7 +2731,7 @@ struct _virDomainABIStability {
 
 virDomainXMLOptionPtr virDomainXMLOptionNew(virDomainDefParserConfigPtr config,
                                             virDomainXMLPrivateDataCallbacksPtr priv,
-                                            virDomainXMLNamespacePtr xmlns,
+                                            virXMLNamespacePtr xmlns,
                                             virDomainABIStabilityPtr abi,
                                             virSaveCookieCallbacksPtr saveCookie);
 
@@ -2747,7 +2747,7 @@ int virDomainXMLOptionRunMomentPostParse(virDomainXMLOptionPtr xmlopt,
 
 void virDomainNetGenerateMAC(virDomainXMLOptionPtr xmlopt, virMacAddrPtr mac);
 
-virDomainXMLNamespacePtr
+virXMLNamespacePtr
 virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt)
     ATTRIBUTE_NONNULL(1);
 

diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h
index e8e9b6c3142d1455cf1675f8aae3152654c10449..a15cfb5f9e1d716a601229aa5564196621c71263 100644 (file)
--- a/src/conf/virconftypes.h
+++ b/src/conf/virconftypes.h
@@ -342,9 +342,6 @@ typedef virDomainVsockDef *virDomainVsockDefPtr;
 typedef struct _virDomainWatchdogDef virDomainWatchdogDef;
 typedef virDomainWatchdogDef *virDomainWatchdogDefPtr;
 
-typedef struct _virDomainXMLNamespace virDomainXMLNamespace;
-typedef virDomainXMLNamespace *virDomainXMLNamespacePtr;
-
 typedef struct _virDomainXMLOption virDomainXMLOption;
 typedef virDomainXMLOption *virDomainXMLOptionPtr;
 

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 87f3c7bd6383c958c3a72e9e90ab65cbdf0d48d5..df847b4fcaf74306a2a734f4192078dabea11e3c 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -317,7 +317,7 @@ lxcDomainDefNamespaceHref(void)
 }
 
 
-virDomainXMLNamespace virLXCDriverDomainXMLNamespace = {
+virXMLNamespace virLXCDriverDomainXMLNamespace = {
     .parse = lxcDomainDefNamespaceParse,
     .free = lxcDomainDefNamespaceFree,
     .format = lxcDomainDefNamespaceFormatXML,

diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h
index 92ed4ac5949ac5bf723341c271bad8d9e8fbe1ae..9cb7090b5b5ea58c7bccc72bf488cf1767293761 100644 (file)
--- a/src/lxc/lxc_domain.h
+++ b/src/lxc/lxc_domain.h
@@ -91,7 +91,7 @@ struct _virLXCDomainObjPrivate {
     struct virLXCDomainJobObj job;
 };
 
-extern virDomainXMLNamespace virLXCDriverDomainXMLNamespace;
+extern virXMLNamespace virLXCDriverDomainXMLNamespace;
 extern virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks;
 extern virDomainDefParserConfig virLXCDriverDomainDefParserConfig;
 

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 880307f215344a93ad258a560338d9d107d87717..f92b483bcfcf4fc5e14814f8e509027572c5a9d6 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3728,7 +3728,7 @@ qemuDomainDefNamespaceHref(void)
 }
 
 
-virDomainXMLNamespace virQEMUDriverDomainXMLNamespace = {
+virXMLNamespace virQEMUDriverDomainXMLNamespace = {
     .parse = qemuDomainDefNamespaceParse,
     .free = qemuDomainDefNamespaceFree,
     .format = qemuDomainDefNamespaceFormatXML,

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 2ba51929db9018ebfd39cb704ce6579f7cdbd308..37a00323a74388e71726c9abcdae588c080b3fdd 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -854,7 +854,7 @@ void qemuDomainCleanupRun(virQEMUDriverPtr driver,
 void qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv);
 
 extern virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks;
-extern virDomainXMLNamespace virQEMUDriverDomainXMLNamespace;
+extern virXMLNamespace virQEMUDriverDomainXMLNamespace;
 extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig;
 extern virDomainABIStability virQEMUDriverDomainABIStability;
 extern virSaveCookieCallbacks virQEMUDriverDomainSaveCookie;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index a59984051d04da36f57b8a79bbfbd743dba782f6..6dbd76d4499b88159b67e04d8752f0e20ce4b472 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -426,7 +426,7 @@ testDomainObjPrivateFree(void *data)
 static testDriverPtr
 testDriverNew(void)
 {
-    virDomainXMLNamespace ns = {
+    virXMLNamespace ns = {
         .parse = testDomainDefNamespaceParse,
         .free = testDomainDefNamespaceFree,
     };

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 7bb5eb956deae7a00e46a701b2e2af41003d771c..0f7c2d5f20f6972d28acf0a7aa2a0b31c20173af 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -603,7 +603,7 @@ virVMXDomainDefNamespaceHref(void)
     return "xmlns:vmware='http://libvirt.org/schemas/domain/vmware/1.0'";
 }
 
-static virDomainXMLNamespace virVMXDomainXMLNamespace = {
+static virXMLNamespace virVMXDomainXMLNamespace = {
     .parse = NULL,
     .free = virVMXDomainDefNamespaceFree,
     .format = virVMXDomainDefNamespaceFormatXML,