[libvirt] [PATCH 17/21] conf: domain: use virXMLNamespaceFormatNS

Ján Tomko jtomko at redhat.com
Tue Aug 20 23:15:39 UTC 2019


Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/bhyve/bhyve_domain.c | 2 +-
 src/conf/domain_conf.c   | 2 +-
 src/lxc/lxc_domain.c     | 2 +-
 src/qemu/qemu_domain.c   | 2 +-
 src/vmx/vmx.c            | 2 +-
 5 files changed, 5 insertions(+), 5 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 3a1f7c9709..a39f5f845d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -28314,7 +28314,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
     if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
         virBufferAsprintf(buf, " id='%d'", def->id);
     if (def->namespaceData && def->ns.format)
-        virBufferAsprintf(buf, " %s", (def->ns.href)());
+        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/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 = {
-- 
2.19.2




More information about the libvir-list mailing list