From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 20 Aug 2019 20:50:15 +0000 (+0200)
Subject: conf: network: use virXMLNamespaceFormatNS
X-Git-Tag: v5.7.0-rc1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=975056af89ae8c1d066f21329afbb7594e2aecb6;p=thirdparty%2Flibvirt.git

conf: network: use virXMLNamespaceFormatNS

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 2c3a11fb10..52b9f0e311 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2434,8 +2434,8 @@ virNetworkDefFormatBuf(virBufferPtr buf,
     bool hasbridge = false;
 
     virBufferAddLit(buf, "<network");
-    if (def->namespaceData && def->ns.href)
-        virBufferAsprintf(buf, " %s", (def->ns.href)());
+    if (def->namespaceData && def->ns.format)
+        virXMLNamespaceFormatNS(buf, &def->ns);
     if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0))
         virBufferAsprintf(buf, " connections='%d'", def->connections);
     if (def->ipv6nogw)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index b0ada0132a..a3f7ae337a 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -244,7 +244,7 @@ networkDnsmasqDefNamespaceFormatXML(virBufferPtr buf,
 static const char *
 networkDnsmasqDefNamespaceHref(void)
 {
-    return "xmlns:dnsmasq='" DNSMASQ_NAMESPACE_HREF "'";
+    return DNSMASQ_NAMESPACE_HREF;
 }