Re: [libvirt] [PATCH 08/21] conf: domain: use generic XML namespace types

[Jiri Denemark]

On Wed, Aug 21, 2019 at 01:15:30 +0200, Ján Tomko wrote:
> Now that virDomainXMLNamespace matches virXMLNamespace,
> we no longer need to keep both around.
> 
> Signed-off-by: Ján Tomko 
> ---
>  src/bhyve/bhyve_domain.c |  2 +-
>  src/bhyve/bhyve_domain.h |  2 +-
>  src/conf/capabilities.h  | 12 
>  src/conf/domain_conf.c   |  6 +++---
>  src/conf/domain_conf.h   |  6 +++---
>  src/conf/virconftypes.h  |  3 ---
>  src/lxc/lxc_domain.c |  2 +-
>  src/lxc/lxc_domain.h |  2 +-
>  src/qemu/qemu_domain.c   |  2 +-
>  src/qemu/qemu_domain.h   |  2 +-
>  src/test/test_driver.c   |  2 +-
>  src/vmx/vmx.c|  2 +-
>  12 files changed, 14 insertions(+), 29 deletions(-)

Reviewed-by: Jiri Denemark 

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

[libvirt] [PATCH 08/21] conf: domain: use generic XML namespace types

[Ján Tomko]

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

Signed-off-by: Ján Tomko 
---
 src/bhyve/bhyve_domain.c |  2 +-
 src/bhyve/bhyve_domain.h |  2 +-
 src/conf/capabilities.h  | 12 
 src/conf/domain_conf.c   |  6 +++---
 src/conf/domain_conf.h   |  6 +++---
 src/conf/virconftypes.h  |  3 ---
 src/lxc/lxc_domain.c |  2 +-
 src/lxc/lxc_domain.h |  2 +-
 src/qemu/qemu_domain.c   |  2 +-
 src/qemu/qemu_domain.h   |  2 +-
 src/test/test_driver.c   |  2 +-
 src/vmx/vmx.c|  2 +-
 12 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 51366f8e26..4924766030 100644
--- 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 17cb283e54..e985278041 100644
--- 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 41c81ceeb1..d6a4e79d77 100644
--- 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 c8c304d2a2..3a1f7c9709 100644
--- 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 >ns;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cbe7b61170..33cef5b75c 100644
--- 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 e8e9b6c314..a15cfb5f9e 100644
--- a/src/conf/virconftypes.h
+++ b/src/conf/virconftypes.h
@@