[libvirt] [PATCH 08/21] conf: domain: use generic XML namespace types
Ján Tomko
jtomko at redhat.com
Tue Aug 20 23:15:30 UTC 2019
Now that virDomainXMLNamespace matches virXMLNamespace,
we no longer need to keep both around.
Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
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 &xmlopt->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
@@ -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 87f3c7bd63..df847b4fca 100644
--- 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 92ed4ac594..9cb7090b5b 100644
--- 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 880307f215..f92b483bcf 100644
--- 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 2ba51929db..37a00323a7 100644
--- 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 a59984051d..6dbd76d449 100644
--- 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 7bb5eb956d..0f7c2d5f20 100644
--- 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,
--
2.19.2
More information about the libvir-list
mailing list