conf: s/virNetworkFindByName/virNetworkObjFindByName/

It's returning virNetworkObjPtr after all. And it matches the
pattern laid out by domain_conf.h.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 30fb309c774800757ee5e2db09bfbf3e0f62c735..d0e7e1b1c59c694dd93d7bb54aeb953fe4a0efb7 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -101,8 +101,8 @@ virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
     return NULL;
 }
 
-virNetworkObjPtr virNetworkFindByName(virNetworkObjListPtr nets,
-                                      const char *name)
+virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets,
+                                         const char *name)
 {
     size_t i;
 
@@ -370,7 +370,7 @@ virNetworkAssignDef(virNetworkObjListPtr nets,
 {
     virNetworkObjPtr network;
 
-    if ((network = virNetworkFindByName(nets, def->name))) {
+    if ((network = virNetworkObjFindByName(nets, def->name))) {
         virNetworkObjAssignDef(network, def, live);
         return network;
     }
@@ -4175,7 +4175,7 @@ virNetworkObjIsDuplicate(virNetworkObjListPtr nets,
         ret = 1;
     } else {
         /* UUID does not match, but if a name matches, refuse it */
-        net = virNetworkFindByName(nets, def->name);
+        net = virNetworkObjFindByName(nets, def->name);
         if (net) {
             char uuidstr[VIR_UUID_STRING_BUFLEN];
             virUUIDFormat(net->def->uuid, uuidstr);

diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 3298376fca076870a5b310e803818b15023f6efd..16aea999b3c539521f46bf9db248f3afb2313241 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -303,8 +303,8 @@ bool virNetworkObjTaint(virNetworkObjPtr obj,
 
 virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
                                          const unsigned char *uuid);
-virNetworkObjPtr virNetworkFindByName(virNetworkObjListPtr nets,
-                                      const char *name);
+virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets,
+                                         const char *name);
 
 
 void virNetworkDefFree(virNetworkDefPtr def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index ac1ee98131d564aef1e130ae724ef776f985cd9a..13e0931570a3ef072d4aa5acd55d254af05a3aeb 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -557,13 +557,13 @@ virNetworkDefParseNode;
 virNetworkDefParseString;
 virNetworkDefUpdateSection;
 virNetworkDeleteConfig;
-virNetworkFindByName;
 virNetworkForwardTypeToString;
 virNetworkIpDefNetmask;
 virNetworkIpDefPrefix;
 virNetworkLoadAllConfigs;
 virNetworkLoadAllState;
 virNetworkObjAssignDef;
+virNetworkObjFindByName;
 virNetworkObjFindByUUID;
 virNetworkObjFree;
 virNetworkObjGetPersistentDef;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 054c9aa2d1929393647a7cd932f0cc1430d57249..2a61991ff2330fbc56436e9625542dc3f97aa6d0 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2505,7 +2505,7 @@ static virNetworkPtr networkLookupByName(virConnectPtr conn,
     virNetworkPtr ret = NULL;
 
     networkDriverLock();
-    network = virNetworkFindByName(driver->networks, name);
+    network = virNetworkObjFindByName(driver->networks, name);
     networkDriverUnlock();
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
@@ -3792,7 +3792,7 @@ networkAllocateActualDevice(virDomainDefPtr dom,
     iface->data.network.actual = NULL;
 
     networkDriverLock();
-    network = virNetworkFindByName(driver->networks, iface->data.network.name);
+    network = virNetworkObjFindByName(driver->networks, iface->data.network.name);
     networkDriverUnlock();
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
@@ -4201,7 +4201,7 @@ networkNotifyActualDevice(virDomainDefPtr dom,
         return 0;
 
     networkDriverLock();
-    network = virNetworkFindByName(driver->networks, iface->data.network.name);
+    network = virNetworkObjFindByName(driver->networks, iface->data.network.name);
     networkDriverUnlock();
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
@@ -4401,7 +4401,7 @@ networkReleaseActualDevice(virDomainDefPtr dom,
         return 0;
 
     networkDriverLock();
-    network = virNetworkFindByName(driver->networks, iface->data.network.name);
+    network = virNetworkObjFindByName(driver->networks, iface->data.network.name);
     networkDriverUnlock();
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
@@ -4560,7 +4560,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
 
     *netaddr = NULL;
     networkDriverLock();
-    network = virNetworkFindByName(driver->networks, netname);
+    network = virNetworkObjFindByName(driver->networks, netname);
     networkDriverUnlock();
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,

diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index c1eebfe35c2d23cdf186c372e1ed26a38c8a8fcb..a347a094134fa51c911382ab660e3b872195c7b2 100644 (file)
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -496,7 +496,7 @@ static virNetworkPtr parallelsNetworkLookupByName(virConnectPtr conn,
     virNetworkPtr ret = NULL;
 
     parallelsDriverLock(privconn);
-    network = virNetworkFindByName(privconn->networks, name);
+    network = virNetworkObjFindByName(privconn->networks, name);
     parallelsDriverUnlock(privconn);
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 6393288cde201f856deaf001520b2b9d07617d44..9591b7c0c39d51ca3eac6d77abfee9a812cf4ee6 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3523,7 +3523,7 @@ static virNetworkPtr testNetworkLookupByName(virConnectPtr conn,
     virNetworkPtr ret = NULL;
 
     testDriverLock(privconn);
-    net = virNetworkFindByName(privconn->networks, name);
+    net = virNetworkObjFindByName(privconn->networks, name);
     testDriverUnlock(privconn);
 
     if (net == NULL) {
@@ -3764,7 +3764,7 @@ static int testNetworkUndefine(virNetworkPtr network)
     virObjectEventPtr event = NULL;
 
     testDriverLock(privconn);
-    privnet = virNetworkFindByName(privconn->networks, network->name);
+    privnet = virNetworkObjFindByName(privconn->networks, network->name);
 
     if (privnet == NULL) {
         virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
@@ -3852,7 +3852,7 @@ static int testNetworkCreate(virNetworkPtr network)
     virObjectEventPtr event = NULL;
 
     testDriverLock(privconn);
-    privnet = virNetworkFindByName(privconn->networks, network->name);
+    privnet = virNetworkObjFindByName(privconn->networks, network->name);
     testDriverUnlock(privconn);
 
     if (privnet == NULL) {
@@ -3888,7 +3888,7 @@ static int testNetworkDestroy(virNetworkPtr network)
     virObjectEventPtr event = NULL;
 
     testDriverLock(privconn);
-    privnet = virNetworkFindByName(privconn->networks, network->name);
+    privnet = virNetworkObjFindByName(privconn->networks, network->name);
 
     if (privnet == NULL) {
         virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
@@ -3924,7 +3924,7 @@ static char *testNetworkGetXMLDesc(virNetworkPtr network,
     virCheckFlags(0, NULL);
 
     testDriverLock(privconn);
-    privnet = virNetworkFindByName(privconn->networks, network->name);
+    privnet = virNetworkObjFindByName(privconn->networks, network->name);
     testDriverUnlock(privconn);
 
     if (privnet == NULL) {
@@ -3946,7 +3946,7 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) {
     virNetworkObjPtr privnet;
 
     testDriverLock(privconn);
-    privnet = virNetworkFindByName(privconn->networks, network->name);
+    privnet = virNetworkObjFindByName(privconn->networks, network->name);
     testDriverUnlock(privconn);
 
     if (privnet == NULL) {
@@ -3977,7 +3977,7 @@ static int testNetworkGetAutostart(virNetworkPtr network,
     int ret = -1;
 
     testDriverLock(privconn);
-    privnet = virNetworkFindByName(privconn->networks, network->name);
+    privnet = virNetworkObjFindByName(privconn->networks, network->name);
     testDriverUnlock(privconn);
 
     if (privnet == NULL) {
@@ -4002,7 +4002,7 @@ static int testNetworkSetAutostart(virNetworkPtr network,
     int ret = -1;
 
     testDriverLock(privconn);
-    privnet = virNetworkFindByName(privconn->networks, network->name);
+    privnet = virNetworkObjFindByName(privconn->networks, network->name);
     testDriverUnlock(privconn);
 
     if (privnet == NULL) {

diff --git a/tests/objectlocking.ml b/tests/objectlocking.ml
index b5ea6cb19f309ca32d8c2dec01064bcf957d1c1d..7826148d9392e6c953844202b916243974036b70 100644 (file)
--- a/tests/objectlocking.ml
+++ b/tests/objectlocking.ml
@@ -62,7 +62,7 @@ let lockedObjMethods = [
    "virDomainAssignDef";
 
    "virNetworkObjFindByUUID";
-   "virNetworkFindByName";
+   "virNetworkObjFindByName";
    "virNetworkAssignDef";
 
    "virNodeDeviceFindByName";