storage: Add ParseSourceString function for use with FindPoolSources.

This will simplify adding FindPoolSources support to more pool backends in
the future (as well as the test driver).

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 13056e8cacaf42dfcda480a6725e58e43dbe1a39..2924a0d91512735085603fa1b3770dd88040a26d 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -474,6 +474,58 @@ cleanup:
     return ret;
 }
 
+virStoragePoolSourcePtr
+virStoragePoolDefParseSourceString(virConnectPtr conn,
+                                   const char *srcSpec,
+                                   int pool_type)
+{
+    xmlDocPtr doc = NULL;
+    xmlNodePtr node = NULL;
+    xmlXPathContextPtr xpath_ctxt = NULL;
+    virStoragePoolSourcePtr def = NULL, ret = NULL;
+
+    doc = xmlReadDoc((const xmlChar *)srcSpec, "srcSpec.xml", NULL,
+                     XML_PARSE_NOENT | XML_PARSE_NONET |
+                     XML_PARSE_NOERROR | XML_PARSE_NOWARNING);
+
+    if (doc == NULL) {
+        virStorageReportError(conn, VIR_ERR_XML_ERROR,
+                              "%s", _("bad <source> spec"));
+        goto cleanup;
+    }
+
+    xpath_ctxt = xmlXPathNewContext(doc);
+    if (xpath_ctxt == NULL) {
+        virReportOOMError(conn);
+        goto cleanup;
+    }
+
+    if (VIR_ALLOC(def) < 0) {
+        virReportOOMError(conn);
+        goto cleanup;
+    }
+
+    node = virXPathNode(conn, "/source", xpath_ctxt);
+    if (!node) {
+        virStorageReportError(conn, VIR_ERR_XML_ERROR,
+                              "%s", _("root element was not source"));
+        goto cleanup;
+    }
+
+    if (virStoragePoolDefParseSource(conn, xpath_ctxt, def, pool_type,
+                                     node) < 0)
+        goto cleanup;
+
+    ret = def;
+    def = NULL;
+cleanup:
+    if (def)
+        virStoragePoolSourceFree(def);
+    xmlFreeDoc(doc);
+    xmlXPathFreeContext(xpath_ctxt);
+
+    return ret;
+}
 static int
 virStorageDefParsePerms(virConnectPtr conn,
                         xmlXPathContextPtr ctxt,

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 652448a3bb45df26ad601313174224829241e59e..a79598105b0c612ff1190d233b265f92207f3bec 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -376,6 +376,10 @@ void virStoragePoolObjRemove(virStoragePoolObjListPtr pools,
                              virStoragePoolObjPtr pool);
 
 virStoragePoolSourcePtr
+virStoragePoolDefParseSourceString(virConnectPtr conn,
+                                   const char *srcSpec,
+                                   int pool_type);
+virStoragePoolSourcePtr
 virStoragePoolSourceListNewSource(virConnectPtr conn,
                                   virStoragePoolSourceListPtr list);
 char *virStoragePoolSourceListFormat(virConnectPtr conn,

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 86974c3af27f6c0f4838fad18199e51a106596f9..9cc92f951ef4bb71dc1a155a11863fdba8bbefa2 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -380,6 +380,7 @@ virStoragePoolObjListFree;
 virStoragePoolObjRemove;
 virStoragePoolObjSaveDef;
 virStoragePoolSourceFree;
+virStoragePoolDefParseSourceString;
 virStoragePoolSourceListNewSource;
 virStoragePoolSourceListFormat;
 virStorageVolDefFindByKey;

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 2b7f083452da9c6b3abf1ecda95c06f0024d5c8a..16e4bd937df7ebf3bcf2612a9227b5d7896500ff 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -199,8 +199,6 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn,
     int vars[] = {
         1
     };
-    xmlDocPtr doc = NULL;
-    xmlXPathContextPtr xpath_ctxt = NULL;
     virNetfsDiscoverState state = {
         .host = NULL,
         .list = {
@@ -210,31 +208,18 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn,
         }
     };
     const char *prog[] = { SHOWMOUNT, "--no-headers", "--exports", NULL, NULL };
+    virStoragePoolSourcePtr source = NULL;
     int exitstatus;
     char *retval = NULL;
     unsigned int i;
 
-    doc = xmlReadDoc((const xmlChar *)srcSpec, "srcSpec.xml", NULL,
-                     XML_PARSE_NOENT | XML_PARSE_NONET |
-                     XML_PARSE_NOERROR | XML_PARSE_NOWARNING);
-    if (doc == NULL) {
-        virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s", _("bad <source> spec"));
+    source = virStoragePoolDefParseSourceString(conn, srcSpec,
+                                                VIR_STORAGE_POOL_NETFS);
+    if (!source)
         goto cleanup;
-    }
 
-    xpath_ctxt = xmlXPathNewContext(doc);
-    if (xpath_ctxt == NULL) {
-        virReportOOMError(conn);
-        goto cleanup;
-    }
-
-    state.host = virXPathString(conn, "string(/source/host/@name)", xpath_ctxt);
-    if (!state.host || !state.host[0]) {
-        virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s",
-                              _("missing <host> in <source> spec"));
-        goto cleanup;
-    }
-    prog[3] = state.host;
+    state.host = source->host.name;
+    prog[3] = source->host.name;
 
     if (virStorageBackendRunProgRegex(conn, NULL, prog, 1, regexes, vars,
                                       virStorageBackendFileSystemNetFindPoolSourcesFunc,
@@ -251,11 +236,10 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn,
     for (i = 0; i < state.list.nsources; i++)
         virStoragePoolSourceFree(&state.list.sources[i]);
 
-    VIR_FREE(state.list.sources);
-    VIR_FREE(state.host);
+    if (source)
+        virStoragePoolSourceFree(source);
 
-    xmlFreeDoc(doc);
-    xmlXPathFreeContext(xpath_ctxt);
+    VIR_FREE(state.list.sources);
 
     return retval;
 }