conf: s/virNetworkFindByName/virNetworkObjFindByName/

It's returning virNetworkObjPtr after all. And it matches the
pattern laid out by domain_conf.h.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>

src/conf/network_conf.c

@@ -101,7 +101,7 @@ virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
     return NULL;
 }
 
-virNetworkObjPtr virNetworkFindByName(virNetworkObjListPtr nets,
+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);

src/conf/network_conf.h

@@ -303,7 +303,7 @@ bool virNetworkObjTaint(virNetworkObjPtr obj,
 
 virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
                                          const unsigned char *uuid);
-virNetworkObjPtr virNetworkFindByName(virNetworkObjListPtr nets,
+virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets,
                                          const char *name);
 
 

src/libvirt_private.syms

@@ -557,13 +557,13 @@ virNetworkDefParseNode;
 virNetworkDefParseString;
 virNetworkDefUpdateSection;
 virNetworkDeleteConfig;
-virNetworkFindByName;
 virNetworkForwardTypeToString;
 virNetworkIpDefNetmask;
 virNetworkIpDefPrefix;
 virNetworkLoadAllConfigs;
 virNetworkLoadAllState;
 virNetworkObjAssignDef;
+virNetworkObjFindByName;
 virNetworkObjFindByUUID;
 virNetworkObjFree;
 virNetworkObjGetPersistentDef;

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,

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,

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) {

tests/objectlocking.ml

@@ -62,7 +62,7 @@ let lockedObjMethods = [
    "virDomainAssignDef";
 
    "virNetworkObjFindByUUID";
-   "virNetworkFindByName";
+   "virNetworkObjFindByName";
    "virNetworkAssignDef";
 
    "virNodeDeviceFindByName";