NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: network: use generic XML namespace types

Browse Source 
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>
This commit is contained in:
Ján Tomko 2019-08-20 21:52:08 +02:00
parent 67ecfb9781
commit 169ab5383b
4 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/network_conf.c
View File

@ -93,7 +93,7 @@ virNetworkXMLOnceInit(void)
VIR_ONCE_GLOBAL_INIT(virNetworkXML); VIR_ONCE_GLOBAL_INIT(virNetworkXML);
virNetworkXMLOptionPtr virNetworkXMLOptionPtr
virNetworkXMLOptionNew(virNetworkXMLNamespacePtr xmlns) virNetworkXMLOptionNew(virXMLNamespacePtr xmlns)
{ {
virNetworkXMLOptionPtr xmlopt; virNetworkXMLOptionPtr xmlopt;

25
src/conf/network_conf.h
View File

@ -23,10 +23,6 @@
#define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as mentioned in RFC-2782 */ #define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as mentioned in RFC-2782 */
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xpath.h>
#include "internal.h" #include "internal.h"
#include "virthread.h" #include "virthread.h"
#include "virsocketaddr.h" #include "virsocketaddr.h"
@ -40,25 +36,12 @@
#include "virobject.h" #include "virobject.h"
#include "virmacmap.h" #include "virmacmap.h"
#include "virenum.h" #include "virenum.h"
#include "virxml.h"
typedef int (*virNetworkDefNamespaceParse)(xmlXPathContextPtr, void **);
typedef void (*virNetworkDefNamespaceFree)(void *);
typedef int (*virNetworkDefNamespaceXMLFormat)(virBufferPtr, void *);
typedef const char *(*virNetworkDefNamespaceHref)(void);
typedef struct _virNetworkXMLNamespace virNetworkXMLNamespace;
typedef virNetworkXMLNamespace *virNetworkXMLNamespacePtr;
struct _virNetworkXMLNamespace {
virNetworkDefNamespaceParse parse;
virNetworkDefNamespaceFree free;
virNetworkDefNamespaceXMLFormat format;
virNetworkDefNamespaceHref href;
};
struct _virNetworkXMLOption { struct _virNetworkXMLOption {
virObject parent; virObject parent;
virNetworkXMLNamespace ns; virXMLNamespace ns;
}; };
typedef struct _virNetworkXMLOption virNetworkXMLOption; typedef struct _virNetworkXMLOption virNetworkXMLOption;
typedef virNetworkXMLOption *virNetworkXMLOptionPtr; typedef virNetworkXMLOption *virNetworkXMLOptionPtr;
@ -295,7 +278,7 @@ struct _virNetworkDef {
/* Network specific XML namespace data */ /* Network specific XML namespace data */
void *namespaceData; void *namespaceData;
virNetworkXMLNamespace ns; virXMLNamespace ns;
}; };
typedef enum { typedef enum {
@ -317,7 +300,7 @@ enum {
}; };
virNetworkXMLOptionPtr virNetworkXMLOptionPtr
virNetworkXMLOptionNew(virNetworkXMLNamespacePtr xmlns); virNetworkXMLOptionNew(virXMLNamespacePtr xmlns);
virNetworkDefPtr virNetworkDefPtr
virNetworkDefCopy(virNetworkDefPtr def, virNetworkDefCopy(virNetworkDefPtr def,

2
src/network/bridge_driver.c
View File

@ -248,7 +248,7 @@ networkDnsmasqDefNamespaceHref(void)
} }
virNetworkXMLNamespace networkDnsmasqXMLNamespace = { virXMLNamespace networkDnsmasqXMLNamespace = {
.parse = networkDnsmasqDefNamespaceParse, .parse = networkDnsmasqDefNamespaceParse,
.free = networkDnsmasqDefNamespaceFree, .free = networkDnsmasqDefNamespaceFree,
.format = networkDnsmasqDefNamespaceFormatXML, .format = networkDnsmasqDefNamespaceFormatXML,

2
src/network/bridge_driver.h
View File

@ -27,7 +27,7 @@
#include "virdnsmasq.h" #include "virdnsmasq.h"
#include "virnetworkobj.h" #include "virnetworkobj.h"
extern virNetworkXMLNamespace networkDnsmasqXMLNamespace; extern virXMLNamespace networkDnsmasqXMLNamespace;
typedef struct _networkDnsmasqXmlNsDef networkDnsmasqXmlNsDef; typedef struct _networkDnsmasqXmlNsDef networkDnsmasqXmlNsDef;
typedef networkDnsmasqXmlNsDef *networkDnsmasqXmlNsDefPtr; typedef networkDnsmasqXmlNsDef *networkDnsmasqXmlNsDefPtr;