src: network_conf: propagate only bool to virNetworkDefParseString()

We don't need to propagate all public flags, only the information
about the presence of the validation one, which can differ from
function to function. This patch makes it easier and more
readable in case of a future additions of validation flags.
This change was suggested by Daniel.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cb9e7218ffc590a8b643b595f0bde6590c96f3af..858f6f923a4c0caf7dbab0f240bc924ae450bb91 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30523,7 +30523,7 @@ virDomainNetResolveActualType(virDomainNetDef *iface)
     if (!(xml = virNetworkGetXMLDesc(net, 0)))
         goto cleanup;
 
-    if (!(def = virNetworkDefParseString(xml, NULL, 0)))
+    if (!(def = virNetworkDefParseString(xml, NULL, false)))
         goto cleanup;
 
     switch ((virNetworkForwardType) def->forward.type) {

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index f23599abac9f1ee115c29d384f406d9fa6a95039..681273a5479b8863a33dbf23bc9300d2f18c1e87 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -318,7 +318,7 @@ virNetworkDefCopy(virNetworkDef *def,
     if (!(xml = virNetworkDefFormat(def, xmlopt, flags)))
        return NULL;
 
-    return virNetworkDefParseString(xml, xmlopt, 0);
+    return virNetworkDefParseString(xml, xmlopt, false);
 }
 
 
@@ -2086,14 +2086,14 @@ static virNetworkDef *
 virNetworkDefParse(const char *xmlStr,
                    const char *filename,
                    virNetworkXMLOption *xmlopt,
-                   unsigned int flags)
+                   bool validate)
 {
     g_autoptr(xmlDoc) xml = NULL;
     virNetworkDef *def = NULL;
     int keepBlanksDefault = xmlKeepBlanksDefault(0);
 
     if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)"),
-                           "network.rng", flags & VIR_NETWORK_DEFINE_VALIDATE)))
+                           "network.rng", validate)))
         def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml), xmlopt);
 
     xmlKeepBlanksDefault(keepBlanksDefault);
@@ -2104,9 +2104,9 @@ virNetworkDefParse(const char *xmlStr,
 virNetworkDef *
 virNetworkDefParseString(const char *xmlStr,
                          virNetworkXMLOption *xmlopt,
-                         unsigned int flags)
+                         bool validate)
 {
-    return virNetworkDefParse(xmlStr, NULL, xmlopt, flags);
+    return virNetworkDefParse(xmlStr, NULL, xmlopt, validate);
 }
 
 
@@ -2114,7 +2114,7 @@ virNetworkDef *
 virNetworkDefParseFile(const char *filename,
                        virNetworkXMLOption *xmlopt)
 {
-    return virNetworkDefParse(NULL, filename, xmlopt, 0);
+    return virNetworkDefParse(NULL, filename, xmlopt, false);
 }
 
 

diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 30958eff64de07c026cef55a3c634704016e4f8d..cf24c8e268d44dee3c88eb9ef82ebbd542a73d7c 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -329,7 +329,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
 virNetworkDef *
 virNetworkDefParseString(const char *xmlStr,
                          virNetworkXMLOption *xmlopt,
-                         unsigned int flags);
+                         bool validate);
 
 virNetworkDef *
 virNetworkDefParseFile(const char *filename,

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

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 06822fb3a06a82000248ecb0988ac9e14151ecc5..86cefbd82b28354d6d39c26883310eda3a05929b 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3474,7 +3474,7 @@ networkCreateXML(virConnectPtr conn,
     virNetworkPtr net = NULL;
     virObjectEvent *event = NULL;
 
-    if (!(newDef = virNetworkDefParseString(xml, network_driver->xmlopt, 0)))
+    if (!(newDef = virNetworkDefParseString(xml, network_driver->xmlopt, false)))
         goto cleanup;
 
     if (virNetworkCreateXMLEnsureACL(conn, newDef) < 0)
@@ -3529,7 +3529,8 @@ networkDefineXMLFlags(virConnectPtr conn,
 
     virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
-    if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt, flags)))
+    if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt,
+                                         !!(flags & VIR_NETWORK_DEFINE_VALIDATE))))
         goto cleanup;
 
     if (virNetworkDefineXMLFlagsEnsureACL(conn, def) < 0)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index df1f4814332a1d4084e540cb92f7998fbd83ebe1..632cb817b96f33dd62282d6c0c6e87ddb0113f88 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4778,7 +4778,7 @@ qemuProcessGetNetworkAddress(const char *netname,
     if (!xml)
         goto cleanup;
 
-    netdef = virNetworkDefParseString(xml, NULL, 0);
+    netdef = virNetworkDefParseString(xml, NULL, false);
     if (!netdef)
         goto cleanup;
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 2f19b7c5209946305ab8a60c2e9b0215ee79de16..2c2c6f52d120d96c0c3fb3b0b1124488508b7bab 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5581,7 +5581,7 @@ testNetworkCreateXML(virConnectPtr conn, const char *xml)
     virNetworkPtr net = NULL;
     virObjectEvent *event = NULL;
 
-    if ((newDef = virNetworkDefParseString(xml, NULL, 0)) == NULL)
+    if ((newDef = virNetworkDefParseString(xml, NULL, false)) == NULL)
         goto cleanup;
 
     if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef,
@@ -5620,7 +5620,8 @@ testNetworkDefineXMLFlags(virConnectPtr conn,
 
     virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
-    if ((newDef = virNetworkDefParseString(xml, NULL, flags)) == NULL)
+    if (!(newDef = virNetworkDefParseString(xml, 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 c554b052c9baa631c66b66207fed11e7171589d9..e772e580ada789b977c184bcdb5bd9e5d5fe266b 100644 (file)
--- a/src/vbox/vbox_network.c
+++ b/src/vbox/vbox_network.c
@@ -397,7 +397,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start,
 
     VBOX_IID_INITIALIZE(&vboxnetiid);
 
-    if (!(def = virNetworkDefParseString(xml, NULL, flags)) ||
+    if (!(def = virNetworkDefParseString(xml, NULL,
+                                         !!(flags & VIR_NETWORK_DEFINE_VALIDATE))) ||
         (def->forward.type != VIR_NETWORK_FORWARD_NONE) ||
         (def->nips == 0 || !def->ips))
         goto cleanup;