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

conf: storage: use virXMLNamespaceRegister

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 fc5f0ccc3e..024f047fab 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -998,6 +998,8 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
      * especially during the virStoragePoolSourceClear method */
     def->ns = options->ns;
     if (def->ns.parse) {
+        if (virXMLNamespaceRegister(ctxt, &def->ns) < 0)
+            return NULL;
         if ((def->ns.parse)(ctxt, &def->namespaceData) < 0)
             return NULL;
     }
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 4bed6df0bb..d947beac2c 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -41,7 +41,6 @@ VIR_LOG_INIT("storage.storage_backend_fs");
 
 #if WITH_STORAGE_FS
 
-# include <libxml/xpathInternals.h>
 # include <mntent.h>
 
 struct _virNetfsDiscoverState {
@@ -571,14 +570,6 @@ virStoragePoolDefFSNamespaceParse(xmlXPathContextPtr ctxt,
     int ret = -1;
     VIR_AUTOFREE(xmlNodePtr *)nodes = NULL;
 
-    if (xmlXPathRegisterNs(ctxt, BAD_CAST "fs",
-                           BAD_CAST STORAGE_POOL_FS_NAMESPACE_HREF) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Failed to register xml namespace '%s'"),
-                       STORAGE_POOL_FS_NAMESPACE_HREF);
-        return -1;
-    }
-
     nnodes = virXPathNodeSet("./fs:mount_opts/fs:option", ctxt, &nodes);
     if (nnodes < 0)
         return -1;
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 2d6c51de35..22caa189d7 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -36,7 +36,6 @@
 #include "rbd/librbd.h"
 #include "secret_util.h"
 #include "storage_util.h"
-#include <libxml/xpathInternals.h>
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
@@ -91,14 +90,6 @@ virStoragePoolDefRBDNamespaceParse(xmlXPathContextPtr ctxt,
     int ret = -1;
     VIR_AUTOFREE(xmlNodePtr *)nodes = NULL;
 
-    if (xmlXPathRegisterNs(ctxt, BAD_CAST "rbd",
-                           BAD_CAST STORAGE_POOL_RBD_NAMESPACE_HREF) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Failed to register xml namespace '%s'"),
-                       STORAGE_POOL_RBD_NAMESPACE_HREF);
-        return -1;
-    }
-
     nnodes = virXPathNodeSet("./rbd:config_opts/rbd:option", ctxt, &nodes);
     if (nnodes < 0)
         return -1;