External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-08 07:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: domain: use generic XML namespace types

Browse Source 
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>
This commit is contained in:
Ján Tomko 2019-08-20 23:39:24 +02:00
parent 5f617627c7
commit 126ac61ea3
12 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bhyve/bhyve_domain.c
View File

@ -273,7 +273,7 @@ bhyveDomainDefNamespaceHref(void)
return "xmlns:bhyve='" BHYVE_NAMESPACE_HREF "'";
}
virDomainXMLNamespace virBhyveDriverDomainXMLNamespace = {
virXMLNamespace virBhyveDriverDomainXMLNamespace = {
.parse = bhyveDomainDefNamespaceParse,
.free = bhyveDomainDefNamespaceFree,
.format = bhyveDomainDefNamespaceFormatXML,

2
src/bhyve/bhyve_domain.h
View File

@ -38,6 +38,6 @@ virDomainXMLOptionPtr virBhyveDriverCreateXMLConf(bhyveConnPtr);
extern virDomainXMLPrivateDataCallbacks virBhyveDriverPrivateDataCallbacks;
extern virDomainDefParserConfig virBhyveDriverDomainDefParserConfig;
extern virDomainXMLNamespace virBhyveDriverDomainXMLNamespace;
extern virXMLNamespace virBhyveDriverDomainXMLNamespace;
bool bhyveDomainDefNeedsISAController(virDomainDefPtr def);

12
src/conf/capabilities.h
View File

@ -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;

6
src/conf/domain_conf.c
View File

@ -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;

6
src/conf/domain_conf.h
View File

@ -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);

3
src/conf/virconftypes.h
View File

@ -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;

2
src/lxc/lxc_domain.c
View File

@ -317,7 +317,7 @@ lxcDomainDefNamespaceHref(void)
}
virDomainXMLNamespace virLXCDriverDomainXMLNamespace = {
virXMLNamespace virLXCDriverDomainXMLNamespace = {
.parse = lxcDomainDefNamespaceParse,
.free = lxcDomainDefNamespaceFree,
.format = lxcDomainDefNamespaceFormatXML,

2
src/lxc/lxc_domain.h
View File

@ -91,7 +91,7 @@ struct _virLXCDomainObjPrivate {
struct virLXCDomainJobObj job;
};
extern virDomainXMLNamespace virLXCDriverDomainXMLNamespace;
extern virXMLNamespace virLXCDriverDomainXMLNamespace;
extern virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks;
extern virDomainDefParserConfig virLXCDriverDomainDefParserConfig;

2
src/qemu/qemu_domain.c
View File

@ -3728,7 +3728,7 @@ qemuDomainDefNamespaceHref(void)
}
virDomainXMLNamespace virQEMUDriverDomainXMLNamespace = {
virXMLNamespace virQEMUDriverDomainXMLNamespace = {
.parse = qemuDomainDefNamespaceParse,
.free = qemuDomainDefNamespaceFree,
.format = qemuDomainDefNamespaceFormatXML,

2
src/qemu/qemu_domain.h
View File

@ -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;

2
src/test/test_driver.c
View File

@ -426,7 +426,7 @@ testDomainObjPrivateFree(void *data)
static testDriverPtr
testDriverNew(void)
{
virDomainXMLNamespace ns = {
virXMLNamespace ns = {
.parse = testDomainDefNamespaceParse,
.free = testDomainDefNamespaceFree,
};

2
src/vmx/vmx.c
View File

@ -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,