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

conf: storage: use virXMLNamespaceFormatNS

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

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index fb8a16a119..fc5f0ccc3e 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -1171,8 +1171,8 @@ virStoragePoolDefFormatBuf(virBufferPtr buf,
         return -1;
     }
     virBufferAsprintf(buf, "<pool type='%s'", type);
-    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);
     virBufferEscapeString(buf, "<name>%s</name>\n", def->name);
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index c2d0d7bd1f..4bed6df0bb 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -636,7 +636,7 @@ virStoragePoolDefFSNamespaceFormatXML(virBufferPtr buf,
 static const char *
 virStoragePoolDefFSNamespaceHref(void)
 {
-    return "xmlns:fs='" STORAGE_POOL_FS_NAMESPACE_HREF "'";
+    return STORAGE_POOL_FS_NAMESPACE_HREF;
 }
 
 #endif /* WITH_STORAGE_FS */
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index f86df9a2fa..2d6c51de35 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -178,7 +178,7 @@ virStoragePoolDefRBDNamespaceFormatXML(virBufferPtr buf,
 static const char *
 virStoragePoolDefRBDNamespaceHref(void)
 {
-    return "xmlns:rbd='" STORAGE_POOL_RBD_NAMESPACE_HREF "'";
+    return STORAGE_POOL_RBD_NAMESPACE_HREF;
 }