conf: storage: Provide only virStorageVolDefParse

Remove the virStorageVolDefParseFile/String shim functions.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 703149241a6a4b79e65729278c27cef3e437b71b..4f2f9e7fb1191e44149c24c0f80602f199488f05 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -1401,7 +1401,7 @@ virStorageVolDefParseXML(virStoragePoolDef *pool,
 }
 
 
-static virStorageVolDef *
+virStorageVolDef *
 virStorageVolDefParse(virStoragePoolDef *pool,
                       const char *xmlStr,
                       const char *filename,
@@ -1418,24 +1418,6 @@ virStorageVolDefParse(virStoragePoolDef *pool,
 }
 
 
-virStorageVolDef *
-virStorageVolDefParseString(virStoragePoolDef *pool,
-                            const char *xmlStr,
-                            unsigned int flags)
-{
-    return virStorageVolDefParse(pool, xmlStr, NULL, flags);
-}
-
-
-virStorageVolDef *
-virStorageVolDefParseFile(virStoragePoolDef *pool,
-                          const char *filename,
-                          unsigned int flags)
-{
-    return virStorageVolDefParse(pool, NULL, filename, flags);
-}
-
-
 static void
 virStorageVolTimestampFormat(virBuffer *buf, const char *name,
                              struct timespec *ts)

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 14167af7613eb4b35e2ca6ea157b8147f4be3f73..bbfdbc2f2f0fd2de8b40ef7d225e66082f75a30c 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -287,14 +287,10 @@ typedef enum {
 } virStorageVolDefParseFlags;
 
 virStorageVolDef *
-virStorageVolDefParseString(virStoragePoolDef *pool,
-                            const char *xml,
-                            unsigned int flags);
-
-virStorageVolDef *
-virStorageVolDefParseFile(virStoragePoolDef *pool,
-                          const char *filename,
-                          unsigned int flags);
+virStorageVolDefParse(virStoragePoolDef *pool,
+                      const char *xmlStr,
+                      const char *filename,
+                      unsigned int flags);
 
 virStorageVolDef *
 virStorageVolDefParseXML(virStoragePoolDef *pool,

diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index c718597d722733d215cc9978f480dcee6b7e6ee6..4efcc2fc750b8d0f9f8271bc93713be33b8d2475 100644 (file)
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -861,7 +861,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool,
     }
 
     /* Parse config */
-    def = virStorageVolDefParseString(&poolDef, xmldesc, 0);
+    def = virStorageVolDefParse(&poolDef, xmldesc, NULL, 0);
 
     if (!def)
         goto cleanup;
@@ -1063,7 +1063,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool,
                                           sourceVolume->name);
 
     /* Parse config */
-    def = virStorageVolDefParseString(&poolDef, xmldesc, 0);
+    def = virStorageVolDefParse(&poolDef, xmldesc, NULL, 0);
 
     if (!def)
         goto cleanup;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 3191c9d5f773c5c22440592fbda86da3756dfd2b..c1ecd1ab048ce27b5d40deba0910259b43b21629 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1078,8 +1078,7 @@ virStorageVolDefFindByName;
 virStorageVolDefFindByPath;
 virStorageVolDefFormat;
 virStorageVolDefFree;
-virStorageVolDefParseFile;
-virStorageVolDefParseString;
+virStorageVolDefParse;
 virStorageVolDefParseXML;
 virStorageVolDefRefreshAllocationTypeFromString;
 virStorageVolDefRefreshAllocationTypeToString;

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index aefe638083faa6420cb31e54f6718c3cba5d0480..c25d9ca1ad9ee04d9263a4704f7a9b39f98c7cfb 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -1893,8 +1893,7 @@ storageVolCreateXML(virStoragePoolPtr pool,
     if ((backend = virStorageBackendForType(def->type)) == NULL)
         goto cleanup;
 
-    voldef = virStorageVolDefParseString(def, xmldesc,
-                                         VIR_VOL_XML_PARSE_OPT_CAPACITY);
+    voldef = virStorageVolDefParse(def, xmldesc, NULL, VIR_VOL_XML_PARSE_OPT_CAPACITY);
     if (voldef == NULL)
         goto cleanup;
 
@@ -2067,8 +2066,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool,
         goto cleanup;
     }
 
-    voldef = virStorageVolDefParseString(def, xmldesc,
-                                         VIR_VOL_XML_PARSE_NO_CAPACITY);
+    voldef = virStorageVolDefParse(def, xmldesc, NULL, VIR_VOL_XML_PARSE_NO_CAPACITY);
     if (voldef == NULL)
         goto cleanup;
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 943c0834cd3f5ffdce5c9052f9b54ce07157d2ff..5a4e240d35a35fe2d868b262ef55ab76b4b211b3 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -7198,7 +7198,7 @@ testStorageVolCreateXML(virStoragePoolPtr pool,
         return NULL;
     def = virStoragePoolObjGetDef(obj);
 
-    privvol = virStorageVolDefParseString(def, xmldesc, 0);
+    privvol = virStorageVolDefParse(def, xmldesc, NULL, 0);
     if (privvol == NULL)
         goto cleanup;
 
@@ -7257,7 +7257,7 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool,
         return NULL;
     def = virStoragePoolObjGetDef(obj);
 
-    privvol = virStorageVolDefParseString(def, xmldesc, 0);
+    privvol = virStorageVolDefParse(def, xmldesc, NULL, 0);
     if (privvol == NULL)
         goto cleanup;
 

diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c
index be609033e1a031dd8ef8a698af2dffb2ca11b487..7d1cee562feea1b5afd91ed24e75e1f3ce2744bc 100644 (file)
--- a/src/vbox/vbox_storage.c
+++ b/src/vbox/vbox_storage.c
@@ -423,7 +423,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool,
     memset(&poolDef, 0, sizeof(poolDef));
     poolDef.type = VIR_STORAGE_POOL_DIR;
 
-    if ((def = virStorageVolDefParseString(&poolDef, xml, 0)) == NULL)
+    if ((def = virStorageVolDefParse(&poolDef, xml, NULL, 0)) == NULL)
         goto cleanup;
 
     if (!def->name ||

diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 22b4cda5c57e09f705263a8435ccde29037ffb68..0b7848d9ea3f14a58e0b95c7103c9aa3140e642b 100644 (file)
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -65,11 +65,11 @@ testCompareXMLToArgvFiles(bool shouldFail,
     if (inputvolxml)
         parse_flags |= VIR_VOL_XML_PARSE_NO_CAPACITY;
 
-    if (!(vol = virStorageVolDefParseFile(def, volxml, parse_flags)))
+    if (!(vol = virStorageVolDefParse(def, NULL, volxml, parse_flags)))
         goto cleanup;
 
     if (inputvolxml &&
-        !(inputvol = virStorageVolDefParseFile(inputpool, inputvolxml, 0)))
+        !(inputvol = virStorageVolDefParse(inputpool, NULL, inputvolxml, 0)))
         goto cleanup;
 
     testSetVolumeType(vol, def);

diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c
index 7b229ac52a91009c5873af8ec20b5409b2e15b5f..3ea54e6a7acb4a835cdcce552dcf9b86621fb7e8 100644 (file)
--- a/tests/storagevolxml2xmltest.c
+++ b/tests/storagevolxml2xmltest.c
@@ -22,7 +22,7 @@ testCompareXMLToXMLFiles(const char *poolxml, const char *inxml,
     if (!(pool = virStoragePoolDefParse(NULL, poolxml, 0)))
         return -1;
 
-    if (!(dev = virStorageVolDefParseFile(pool, inxml, flags)))
+    if (!(dev = virStorageVolDefParse(pool, NULL, inxml, flags)))
         return -1;
 
     if (!(actual = virStorageVolDefFormat(pool, dev)))