From 56ecb331027162375bf8404080bcd94d39912c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Wed, 21 Aug 2019 00:14:53 +0200
Subject: [PATCH] conf: domain: use virXMLNamespaceFormatNS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/bhyve/bhyve_domain.c | 2 +-
 src/conf/domain_conf.c   | 4 ++--
 src/lxc/lxc_domain.c     | 2 +-
 src/qemu/qemu_domain.c   | 2 +-
 src/test/test_driver.c   | 7 +++++++
 src/vmx/vmx.c            | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 9a21cde452..631fb50db9 100644
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -270,7 +270,7 @@ bhyveDomainDefNamespaceFormatXML(virBufferPtr buf,
 static const char *
 bhyveDomainDefNamespaceHref(void)
 {
-    return "xmlns:bhyve='" BHYVE_NAMESPACE_HREF "'";
+    return BHYVE_NAMESPACE_HREF;
 }
 
 virXMLNamespace virBhyveDriverDomainXMLNamespace = {
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 705a5a64df..a39f5f845d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -28313,8 +28313,8 @@ virDomainDefFormatInternal(virDomainDefPtr def,
     virBufferAsprintf(buf, "<domain type='%s'", type);
     if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
         virBufferAsprintf(buf, " id='%d'", def->id);
-    if (def->namespaceData && def->ns.href)
-        virBufferAsprintf(buf, " %s", (def->ns.href)());
+    if (def->namespaceData && def->ns.format)
+        virXMLNamespaceFormatNS(buf, &def->ns);
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);
 
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index b61c172804..022e3c6f6a 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -313,7 +313,7 @@ lxcDomainDefNamespaceFormatXML(virBufferPtr buf,
 static const char *
 lxcDomainDefNamespaceHref(void)
 {
-    return "xmlns:lxc='" LXC_NAMESPACE_HREF "'";
+    return LXC_NAMESPACE_HREF;
 }
 
 
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index bd124b824c..0b2065b52c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3724,7 +3724,7 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf,
 static const char *
 qemuDomainDefNamespaceHref(void)
 {
-    return "xmlns:qemu='" QEMU_NAMESPACE_HREF "'";
+    return QEMU_NAMESPACE_HREF;
 }
 
 
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index adda3ac4c0..3bdeb6c00a 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -181,6 +181,12 @@ struct _testDomainNamespaceDef {
     xmlNodePtr *snap_nodes;
 };
 
+static const char*
+testDomainDefNamespaceHref(void)
+{
+    return TEST_NAMESPACE_HREF;
+}
+
 static void
 testDomainDefNamespaceFree(void *data)
 {
@@ -430,6 +436,7 @@ testDriverNew(void)
         .parse = testDomainDefNamespaceParse,
         .free = testDomainDefNamespaceFree,
         .prefix = "test",
+        .href = testDomainDefNamespaceHref,
     };
     virDomainDefParserConfig config = {
         .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG |
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index ac24e765d4..c4e90537f8 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -600,7 +600,7 @@ virVMXDomainDefNamespaceFormatXML(virBufferPtr buf, void *nsdata)
 static const char *
 virVMXDomainDefNamespaceHref(void)
 {
-    return "xmlns:vmware='http://libvirt.org/schemas/domain/vmware/1.0'";
+    return "http://libvirt.org/schemas/domain/vmware/1.0";
 }
 
 static virXMLNamespace virVMXDomainXMLNamespace = {