conf: storage: Provide only virStoragePoolDefParse

Replace the virStoragePoolDefParseString/File thin wrappers by
virStoragePoolDefParse.

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index adbd97e632751023e2864afdef9b806e8ab3ab55..2a3ea9641fe09755972b4421d106e8a7515d826a 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29914,7 +29914,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSource *src,
     if (!(poolxml = virStoragePoolGetXMLDesc(pool, 0)))
         return -1;
 
-    if (!(pooldef = virStoragePoolDefParseString(poolxml, 0)))
+    if (!(pooldef = virStoragePoolDefParse(poolxml, NULL, 0)))
         return -1;
 
     src->srcpool->pooltype = pooldef->type;

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index c11f40488d664830e050b4a53a3b48ea6ebab8cc..0c095c73e08328df1d273f478824baa066652658 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -972,7 +972,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
 }
 
 
-static virStoragePoolDef *
+virStoragePoolDef *
 virStoragePoolDefParse(const char *xmlStr,
                        const char *filename,
                        unsigned int flags)
@@ -990,21 +990,6 @@ virStoragePoolDefParse(const char *xmlStr,
 }
 
 
-virStoragePoolDef *
-virStoragePoolDefParseString(const char *xmlStr,
-                             unsigned int flags)
-{
-    return virStoragePoolDefParse(xmlStr, NULL, flags);
-}
-
-
-virStoragePoolDef *
-virStoragePoolDefParseFile(const char *filename)
-{
-    return virStoragePoolDefParse(NULL, filename, 0);
-}
-
-
 static int
 virStoragePoolSourceFormat(virBuffer *buf,
                            virStoragePoolOptions *options,

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 5eee5b68819921c301e63de8b02567acd3827936..ead54ca7c64ecd7d51e8e34e147a49823c12247f 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -272,11 +272,9 @@ virStoragePoolDef *
 virStoragePoolDefParseXML(xmlXPathContextPtr ctxt);
 
 virStoragePoolDef *
-virStoragePoolDefParseString(const char *xml,
-                             unsigned int flags);
-
-virStoragePoolDef *
-virStoragePoolDefParseFile(const char *filename);
+virStoragePoolDefParse(const char *xmlStr,
+                       const char *filename,
+                       unsigned int flags);
 
 char *
 virStoragePoolDefFormat(virStoragePoolDef *def);

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index e1465c8376abb0da4b22a7b6d4bf1cf8477729af..77128a4846c7bc760808a52fcd5913d8223c840f 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -1579,7 +1579,7 @@ virStoragePoolObjLoad(virStoragePoolObjList *pools,
 
     VIR_DEBUG("loading storage pool config XML '%s'", path);
 
-    if (!(def = virStoragePoolDefParseFile(path)))
+    if (!(def = virStoragePoolDefParse(NULL, path, 0)))
         return NULL;
 
     if (!virStringMatchesNameSuffix(file, def->name, ".xml")) {

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index ddc2394fb9591e0e8c31758ceaf0d52c8d16dc8d..8fec8d90272af5e3a73672853f372a7ae03ca0a5 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1053,9 +1053,8 @@ virStoragePoolCapsNew;
 virStoragePartedFsTypeToString;
 virStoragePoolDefFormat;
 virStoragePoolDefFree;
-virStoragePoolDefParseFile;
+virStoragePoolDefParse;
 virStoragePoolDefParseSourceString;
-virStoragePoolDefParseString;
 virStoragePoolFormatDiskTypeFromString;
 virStoragePoolFormatDiskTypeToString;
 virStoragePoolFormatFileSystemNetTypeToString;

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index fccf0fcf5282512b56d8738ae9c5569eca791c90..aefe638083faa6420cb31e54f6718c3cba5d0480 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -721,7 +721,7 @@ storagePoolCreateXML(virConnectPtr conn,
     VIR_EXCLUSIVE_FLAGS_RET(VIR_STORAGE_POOL_BUILD_OVERWRITE,
                             VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, NULL);
 
-    if (!(newDef = virStoragePoolDefParseString(xml, 0)))
+    if (!(newDef = virStoragePoolDefParse(xml, NULL, 0)))
         goto cleanup;
 
     if (virStoragePoolCreateXMLEnsureACL(conn, newDef) < 0)
@@ -801,7 +801,7 @@ storagePoolDefineXML(virConnectPtr conn,
 
     virCheckFlags(VIR_STORAGE_POOL_DEFINE_VALIDATE, NULL);
 
-    if (!(newDef = virStoragePoolDefParseString(xml, flags)))
+    if (!(newDef = virStoragePoolDefParse(xml, NULL, flags)))
         goto cleanup;
 
     if (virXMLCheckIllegalChars("name", newDef->name, "\n") < 0)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 27cf3ced43057dd3bbb4a080e3f76166dcfceeb9..4245b32c156b5808fa01e52aec5e84459bceda9a 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -6631,7 +6631,7 @@ testStoragePoolCreateXML(virConnectPtr conn,
     virCheckFlags(0, NULL);
 
     virObjectLock(privconn);
-    if (!(newDef = virStoragePoolDefParseString(xml, 0)))
+    if (!(newDef = virStoragePoolDefParse(xml, NULL, 0)))
         goto cleanup;
 
     if (!(obj = virStoragePoolObjListAdd(privconn->pools, &newDef,
@@ -6693,7 +6693,7 @@ testStoragePoolDefineXML(virConnectPtr conn,
     virCheckFlags(VIR_STORAGE_POOL_DEFINE_VALIDATE, NULL);
 
     virObjectLock(privconn);
-    if (!(newDef = virStoragePoolDefParseString(xml, flags)))
+    if (!(newDef = virStoragePoolDefParse(xml, NULL, flags)))
         goto cleanup;
 
     newDef->capacity = defaultPoolCap;

diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c
index 04ff45f98dba9c6a981399d1c29097da277cbe0f..e8e40d695ee6057b9b39aec38edefe650c3cc4b4 100644 (file)
--- a/tests/storagepoolxml2argvtest.c
+++ b/tests/storagepoolxml2argvtest.c
@@ -27,7 +27,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
     g_autofree char *src = NULL;
     g_autoptr(virCommand) cmd = NULL;
 
-    if (!(def = virStoragePoolDefParseFile(poolxml)))
+    if (!(def = virStoragePoolDefParse(NULL, poolxml, 0)))
         goto cleanup;
     defTypeStr = virStoragePoolTypeToString(def->type);
 

diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c
index 76d6f54b332548d5f1ac563486369ba82cf3ba69..6a485941970bd1bc5a5d71e07eb2853edd29e9d7 100644 (file)
--- a/tests/storagepoolxml2xmltest.c
+++ b/tests/storagepoolxml2xmltest.c
@@ -19,7 +19,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
     g_autofree char *actual = NULL;
     g_autoptr(virStoragePoolDef) dev = NULL;
 
-    if (!(dev = virStoragePoolDefParseFile(inxml)))
+    if (!(dev = virStoragePoolDefParse(NULL, inxml, 0)))
         return -1;
 
     if (!(actual = virStoragePoolDefFormat(dev)))

diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c
index 6f1fc7b38c2124a5fe6da855deb52915ab5e8b50..22b4cda5c57e09f705263a8435ccde29037ffb68 100644 (file)
--- a/tests/storagevolxml2argvtest.c
+++ b/tests/storagevolxml2argvtest.c
@@ -48,7 +48,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
     g_autoptr(virStorageVolDef) inputvol = NULL;
     g_autoptr(virStoragePoolDef) inputpool = NULL;
 
-    if (!(def = virStoragePoolDefParseFile(poolxml)))
+    if (!(def = virStoragePoolDefParse(NULL, poolxml, 0)))
         goto cleanup;
 
     if (!(obj = virStoragePoolObjNew())) {
@@ -58,7 +58,7 @@ testCompareXMLToArgvFiles(bool shouldFail,
     virStoragePoolObjSetDef(obj, def);
 
     if (inputpoolxml) {
-        if (!(inputpool = virStoragePoolDefParseFile(inputpoolxml)))
+        if (!(inputpool = virStoragePoolDefParse(NULL, inputpoolxml, 0)))
             goto cleanup;
     }
 

diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c
index 161cb7c6bc56bc8a1253d850c995d973a04c5b5c..7b229ac52a91009c5873af8ec20b5409b2e15b5f 100644 (file)
--- a/tests/storagevolxml2xmltest.c
+++ b/tests/storagevolxml2xmltest.c
@@ -19,7 +19,7 @@ testCompareXMLToXMLFiles(const char *poolxml, const char *inxml,
     g_autoptr(virStoragePoolDef) pool = NULL;
     g_autoptr(virStorageVolDef) dev = NULL;
 
-    if (!(pool = virStoragePoolDefParseFile(poolxml)))
+    if (!(pool = virStoragePoolDefParse(NULL, poolxml, 0)))
         return -1;
 
     if (!(dev = virStorageVolDefParseFile(pool, inxml, flags)))