External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: network: use virXMLNamespaceRegister

Browse Source 
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 22:14:46 +02:00
parent 37a11c3726
commit 8879554015
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/network_conf.c
View File

@ -2051,6 +2051,8 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
if (xmlopt)
def->ns = xmlopt->ns;
if (def->ns.parse) {
if (virXMLNamespaceRegister(ctxt, &def->ns) < 0)
goto error;
if ((def->ns.parse)(ctxt, &def->namespaceData) < 0)
goto error;
}

10
src/network/bridge_driver.c
View File

@ -69,8 +69,6 @@
#include "virjson.h"
#include "virnetworkportdef.h"
#include <libxml/xpathInternals.h>
#define VIR_FROM_THIS VIR_FROM_NETWORK
#define MAX_BRIDGE_ID 256
@ -191,14 +189,6 @@ networkDnsmasqDefNamespaceParse(xmlXPathContextPtr ctxt,
networkDnsmasqXmlNsDefPtr nsdata = NULL;
int ret = -1;
if (xmlXPathRegisterNs(ctxt, BAD_CAST "dnsmasq",
BAD_CAST DNSMASQ_NAMESPACE_HREF) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to register xml namespace '%s'"),
DNSMASQ_NAMESPACE_HREF);
return -1;
}
if (VIR_ALLOC(nsdata) < 0)
return -1;