network: allow VIR_NETWORK_DEFINE_VALIDATE flag

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

diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 8a0cfa37294a731c4e2415e71b04a537de4834d1..673ed5421f4c3a1d511b1c494446a1e8410b273c 100644 (file)
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -292,13 +292,13 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml,
 
     unsigned char md5[VIR_CRYPTO_HASH_SIZE_MD5]; /* VIR_CRYPTO_HASH_SIZE_MD5 = VIR_UUID_BUFLEN = 16 */
 
-    virCheckFlags(0, NULL);
+    virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
     if (esxVI_EnsureSession(priv->primary) < 0)
         return NULL;
 
     /* Parse network XML */
-    def = virNetworkDefParseString(xml, NULL, 0);
+    def = virNetworkDefParseString(xml, NULL, flags);
 
     if (!def)
         return NULL;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 207163cde2ff2d62cd2cab64fb8b9112c095cd12..e8b9ffa1fcaefd5960a3850bf564c3f390ebfb86 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3527,9 +3527,9 @@ networkDefineXMLFlags(virConnectPtr conn,
     virNetworkPtr net = NULL;
     virObjectEvent *event = NULL;
 
-    virCheckFlags(0, NULL);
+    virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
-    if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt, 0)))
+    if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt, flags)))
         goto cleanup;
 
     if (virNetworkDefineXMLFlagsEnsureACL(conn, def) < 0)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 117d1e6ba9ceaf67a1b07d92dc0f207d57d9b95b..f60ea870db921eb4f1cfb2b0c8ac1badec32d92a 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -5618,9 +5618,9 @@ testNetworkDefineXMLFlags(virConnectPtr conn,
     virNetworkPtr net = NULL;
     virObjectEvent *event = NULL;
 
-    virCheckFlags(0, NULL);
+    virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
-    if ((newDef = virNetworkDefParseString(xml, NULL, 0)) == NULL)
+    if ((newDef = virNetworkDefParseString(xml, NULL, flags)) == NULL)
         goto cleanup;
 
     if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef, 0)))

diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c
index 804f9f0b01aae7f164653184832621b9d1d15bb8..c554b052c9baa631c66b66207fed11e7171589d9 100644 (file)
--- a/src/vbox/vbox_network.c
+++ b/src/vbox/vbox_network.c
@@ -386,7 +386,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start,
     virNetworkPtr ret = NULL;
     nsresult rc;
 
-    virCheckFlags(0, NULL);
+    virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL);
 
     if (!data->vboxObj)
         return ret;
@@ -397,7 +397,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start,
 
     VBOX_IID_INITIALIZE(&vboxnetiid);
 
-    if (!(def = virNetworkDefParseString(xml, NULL, 0)) ||
+    if (!(def = virNetworkDefParseString(xml, NULL, flags)) ||
         (def->forward.type != VIR_NETWORK_FORWARD_NONE) ||
         (def->nips == 0 || !def->ips))
         goto cleanup;