From ff94298fad018a6c7fc689d876f648cf366483b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Wed, 21 Aug 2019 00:08:33 +0200 Subject: [PATCH] conf: storage: use virXMLNamespaceFormatNS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ján Tomko Reviewed-by: Jiri Denemark --- src/conf/storage_conf.c | 4 ++-- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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, "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, "%s\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; } -- 2.47.2