External/libvirt
1
0
Fork 0
Code

conf: storage: use virXMLNamespaceRegister

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Ján Tomko 2019-08-21 00:18:55 +02:00
parent 8879554015
commit 80fb4d9c81
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/storage_conf.c
View File

@ -998,6 +998,8 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
* especially during the virStoragePoolSourceClear method */ * especially during the virStoragePoolSourceClear method */
def->ns = options->ns; def->ns = options->ns;
if (def->ns.parse) { if (def->ns.parse) {
if (virXMLNamespaceRegister(ctxt, &def->ns) < 0)
return NULL;
if ((def->ns.parse)(ctxt, &def->namespaceData) < 0) if ((def->ns.parse)(ctxt, &def->namespaceData) < 0)
return NULL; return NULL;
} }

9
src/storage/storage_backend_fs.c
View File

@ -41,7 +41,6 @@ VIR_LOG_INIT("storage.storage_backend_fs");
#if WITH_STORAGE_FS #if WITH_STORAGE_FS
# include <libxml/xpathInternals.h>
# include <mntent.h> # include <mntent.h>
struct _virNetfsDiscoverState { struct _virNetfsDiscoverState {
@ -571,14 +570,6 @@ virStoragePoolDefFSNamespaceParse(xmlXPathContextPtr ctxt,
int ret = -1; int ret = -1;
VIR_AUTOFREE(xmlNodePtr *)nodes = NULL; 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); nnodes = virXPathNodeSet("./fs:mount_opts/fs:option", ctxt, &nodes);
if (nnodes < 0) if (nnodes < 0)
return -1; return -1;

9
src/storage/storage_backend_rbd.c
View File

@ -36,7 +36,6 @@
#include "rbd/librbd.h" #include "rbd/librbd.h"
#include "secret_util.h" #include "secret_util.h"
#include "storage_util.h" #include "storage_util.h"
#include <libxml/xpathInternals.h>
#define VIR_FROM_THIS VIR_FROM_STORAGE #define VIR_FROM_THIS VIR_FROM_STORAGE
@ -91,14 +90,6 @@ virStoragePoolDefRBDNamespaceParse(xmlXPathContextPtr ctxt,
int ret = -1; int ret = -1;
VIR_AUTOFREE(xmlNodePtr *)nodes = NULL; 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); nnodes = virXPathNodeSet("./rbd:config_opts/rbd:option", ctxt, &nodes);
if (nnodes < 0) if (nnodes < 0)
return -1; return -1;