conf: network: Provide only virNetworkDefParse

Replace virNetworkDefParseString/File by direct calls to
virNetworkDefParse.

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 2a3ea9641fe09755972b4421d106e8a7515d826a..5bb5cfa500d8c5e77d6c4f0df79a5bea43920f51 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29728,7 +29728,7 @@ virDomainNetResolveActualType(virDomainNetDef *iface)
     if (!(xml = virNetworkGetXMLDesc(net, 0)))
         return -1;
 
-    if (!(def = virNetworkDefParseString(xml, NULL, false)))
+    if (!(def = virNetworkDefParse(xml, NULL, NULL, false)))
         return -1;
 
     switch ((virNetworkForwardType) def->forward.type) {

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 3574c0214b0ca1d02b42ef8b5f5ff66b19aca37b..be43894050f9424a702e253a936b552d1b22ab68 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -315,7 +315,7 @@ virNetworkDefCopy(virNetworkDef *def,
     if (!(xml = virNetworkDefFormat(def, xmlopt, flags)))
        return NULL;
 
-    return virNetworkDefParseString(xml, xmlopt, false);
+    return virNetworkDefParse(xml, NULL, xmlopt, false);
 }
 
 
@@ -2025,7 +2025,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
 }
 
 
-static virNetworkDef *
+virNetworkDef *
 virNetworkDefParse(const char *xmlStr,
                    const char *filename,
                    virNetworkXMLOption *xmlopt,
@@ -2046,23 +2046,6 @@ virNetworkDefParse(const char *xmlStr,
 }
 
 
-virNetworkDef *
-virNetworkDefParseString(const char *xmlStr,
-                         virNetworkXMLOption *xmlopt,
-                         bool validate)
-{
-    return virNetworkDefParse(xmlStr, NULL, xmlopt, validate);
-}
-
-
-virNetworkDef *
-virNetworkDefParseFile(const char *filename,
-                       virNetworkXMLOption *xmlopt)
-{
-    return virNetworkDefParse(NULL, filename, xmlopt, false);
-}
-
-
 static int
 virNetworkDNSDefFormat(virBuffer *buf,
                        const virNetworkDNSDef *def)

diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 49d3ce6b30f5ab12eaae1a29fd3090549e48ec9f..2b2e9d15f03be1d1acf33b22bdf859cedc61ff29 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -325,13 +325,10 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
                       virNetworkXMLOption *xmlopt);
 
 virNetworkDef *
-virNetworkDefParseString(const char *xmlStr,
-                         virNetworkXMLOption *xmlopt,
-                         bool validate);
-
-virNetworkDef *
-virNetworkDefParseFile(const char *filename,
-                       virNetworkXMLOption *xmlopt);
+virNetworkDefParse(const char *xmlStr,
+                   const char *filename,
+                   virNetworkXMLOption *xmlopt,
+                   bool validate);
 
 char *
 virNetworkDefFormat(const virNetworkDef *def,

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 7621fa338080280f474c1e5eaae145168503b901..d23eb2f4014f4415b3b0ab72b8ade0de3b4be74b 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -967,7 +967,7 @@ virNetworkLoadConfig(virNetworkObjList *nets,
     if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0)
         goto error;
 
-    if (!(def = virNetworkDefParseFile(configFile, xmlopt)))
+    if (!(def = virNetworkDefParse(NULL, configFile, xmlopt, false)))
         goto error;
 
     if (STRNEQ(name, def->name)) {

diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index bf9630ce9dfb61fc845e0362af274b2dc5232eed..1261b3f1fa3a871977fd3b24e48e07980a4544c5 100644 (file)
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -296,7 +296,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml,
         return NULL;
 
     /* Parse network XML */
-    def = virNetworkDefParseString(xml, NULL, !!(flags & VIR_NETWORK_DEFINE_VALIDATE));
+    def = virNetworkDefParse(xml, NULL, NULL, !!(flags & VIR_NETWORK_DEFINE_VALIDATE));
 
     if (!def)
         return NULL;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 3ce2cc1a7e0a36948a76cc9c887b105125bd3a91..5714e0c11439ea74eff5055a1de895f456bbad3c 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -828,8 +828,7 @@ virNetworkDefForwardIf;
 virNetworkDefFree;
 virNetworkDefGetIPByIndex;
 virNetworkDefGetRouteByIndex;
-virNetworkDefParseFile;
-virNetworkDefParseString;
+virNetworkDefParse;
 virNetworkDefParseXML;
 virNetworkDefUpdateSection;
 virNetworkDHCPLeaseTimeUnitTypeFromString;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index e4f5e93779abd4ffd05dc3ed656818e702197dc7..a5973e26cd8096045692b55f0475c9ff7c6007b2 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3017,8 +3017,8 @@ networkCreateXMLFlags(virConnectPtr conn,
 
     virCheckFlags(VIR_NETWORK_CREATE_VALIDATE, NULL);
 
-    if (!(newDef = virNetworkDefParseString(xml, network_driver->xmlopt,
-                                            !!(flags & VIR_NETWORK_CREATE_VALIDATE))))
+    if (!(newDef = virNetworkDefParse(xml, NULL, network_driver->xmlopt,
+                                      !!(flags & VIR_NETWORK_CREATE_VALIDATE))))
         goto cleanup;
 
     if (virNetworkCreateXMLFlagsEnsureACL(conn, newDef) < 0)
@@ -3082,8 +3082,8 @@ networkDefineXMLFlags(virConnectPtr conn,
 
     virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
-    if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt,
-                                         !!(flags & VIR_NETWORK_DEFINE_VALIDATE))))
+    if (!(def = virNetworkDefParse(xml, NULL, network_driver->xmlopt,
+                                   !!(flags & VIR_NETWORK_DEFINE_VALIDATE))))
         goto cleanup;
 
     defAlias = def; /* so we can still ref the object after nullifying def */

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 97336e26228aa6618ddad5efe411eb99a56e8cf1..cec4a64526cd1b018db4171594b82da65c3585d2 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4852,7 +4852,7 @@ qemuProcessGetNetworkAddress(const char *netname,
     if (!xml)
         return -1;
 
-    netdef = virNetworkDefParseString(xml, NULL, false);
+    netdef = virNetworkDefParse(xml, NULL, NULL, false);
     if (!netdef)
         return -1;
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4c4eabc9fcf7833cd22db803f07de3f341bf559d..9f0517e89e54a4d11e0eb8fa82b19da6905c34eb 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5559,8 +5559,8 @@ testNetworkCreateXMLFlags(virConnectPtr conn, const char *xml,
 
     virCheckFlags(VIR_NETWORK_CREATE_VALIDATE, NULL);
 
-    if (!(newDef = virNetworkDefParseString(xml, NULL,
-                                            !!(flags & VIR_NETWORK_CREATE_VALIDATE))))
+    if (!(newDef = virNetworkDefParse(xml, NULL, NULL,
+                                      !!(flags & VIR_NETWORK_CREATE_VALIDATE))))
         goto cleanup;
 
     if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef,
@@ -5605,8 +5605,8 @@ testNetworkDefineXMLFlags(virConnectPtr conn,
 
     virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
-    if (!(newDef = virNetworkDefParseString(xml, NULL,
-                                            !!(flags & VIR_NETWORK_DEFINE_VALIDATE))))
+    if (!(newDef = virNetworkDefParse(xml, NULL, NULL,
+                                      !!(flags & VIR_NETWORK_DEFINE_VALIDATE))))
         goto cleanup;
 
     if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef, 0)))

diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c
index 885fd48321380017766b10fe890a4c5cb2bef712..c3dea6610231b39660eddb875fa81109c10c324f 100644 (file)
--- a/src/vbox/vbox_network.c
+++ b/src/vbox/vbox_network.c
@@ -402,7 +402,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start,
 
     VBOX_IID_INITIALIZE(&vboxnetiid);
 
-    if (!(def = virNetworkDefParseString(xml, NULL, validate)) ||
+    if (!(def = virNetworkDefParse(xml, NULL, NULL, validate)) ||
         (def->forward.type != VIR_NETWORK_FORWARD_NONE) ||
         (def->nips == 0 || !def->ips))
         goto cleanup;

diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index bbeb849a3957476402fe2ba0351e4f6873edb86c..726f073ddc5f0f7b817fd6f5b2dc57eb32949148 100644 (file)
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -31,7 +31,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf,
     if (!(xmlopt = networkDnsmasqCreateXMLConf()))
         goto fail;
 
-    if (!(def = virNetworkDefParseFile(inxml, xmlopt)))
+    if (!(def = virNetworkDefParse(NULL, inxml, xmlopt, false)))
         goto fail;
 
     if (!(obj = virNetworkObjNew()))

diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
index ca793fd4ea12b28d8a5a4233312275a224231083..cb66a26294df543bdd4eb124e43a3753ea507059 100644 (file)
--- a/tests/networkxml2firewalltest.c
+++ b/tests/networkxml2firewalltest.c
@@ -95,7 +95,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
 
     virCommandSetDryRun(dryRunToken, &buf, true, true, testCommandDryRun, NULL);
 
-    if (!(def = virNetworkDefParseFile(xml, NULL)))
+    if (!(def = virNetworkDefParse(NULL, xml, NULL, false)))
         return -1;
 
     if (networkAddFirewallRules(def) < 0)

diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index 521f058acc194bfad3d9544ea48adc1acf09d1c0..b0814c7529beafbeb482a213b3284d0e56927331 100644 (file)
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -33,7 +33,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
     if (!(xmlopt = networkDnsmasqCreateXMLConf()))
         goto cleanup;
 
-    if (!(dev = virNetworkDefParseFile(inxml, xmlopt))) {
+    if (!(dev = virNetworkDefParse(NULL, inxml, xmlopt, false))) {
         result = TEST_COMPARE_NET_XML2XML_RESULT_FAIL_PARSE;
         goto cleanup;
     }

diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatetest.c
index 58b6f70c96a7ea8f2dbda0bc339f90ce51b80302..afe2b1f57479e00e510852b40dec6153284b103c 100644 (file)
--- a/tests/networkxml2xmlupdatetest.c
+++ b/tests/networkxml2xmlupdatetest.c
@@ -25,7 +25,7 @@ testCompareXMLToXMLFiles(const char *netxml, const char *updatexml,
     if (virTestLoadFile(updatexml, &updateXmlData) < 0)
         return -1;
 
-    if (!(def = virNetworkDefParseFile(netxml, NULL)))
+    if (!(def = virNetworkDefParse(NULL, netxml, NULL, false)))
         goto fail;
 
     if (virNetworkDefUpdateSection(def, command, section, parentIndex,