conf: s/virNetworkFindByUUID/virNetworkObjFindByUUID/

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 00be8b67726306bc807b909cfd1b040379d63ce7..30fb309c774800757ee5e2db09bfbf3e0f62c735 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -86,8 +86,8 @@ virNetworkObjTaint(virNetworkObjPtr obj,
     return true;
 }
 
-virNetworkObjPtr virNetworkFindByUUID(virNetworkObjListPtr nets,
-                                      const unsigned char *uuid)
+virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
+                                         const unsigned char *uuid)
 {
     size_t i;
 
@@ -4150,7 +4150,7 @@ virNetworkObjIsDuplicate(virNetworkObjListPtr nets,
     virNetworkObjPtr net = NULL;
 
     /* See if a network with matching UUID already exists */
-    net = virNetworkFindByUUID(nets, def->uuid);
+    net = virNetworkObjFindByUUID(nets, def->uuid);
     if (net) {
         /* UUID matches, but if names don't match, refuse it */
         if (STRNEQ(net->def->name, def->name)) {

diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 74665e01d0798d2705e3ca1276114624c240808a..3298376fca076870a5b310e803818b15023f6efd 100644 (file)
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -301,8 +301,8 @@ virNetworkObjIsActive(const virNetworkObj *net)
 bool virNetworkObjTaint(virNetworkObjPtr obj,
                         virNetworkTaintFlags taint);
 
-virNetworkObjPtr virNetworkFindByUUID(virNetworkObjListPtr nets,
-                                      const unsigned char *uuid);
+virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
+                                         const unsigned char *uuid);
 virNetworkObjPtr virNetworkFindByName(virNetworkObjListPtr nets,
                                       const char *name);
 

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6028002054757233499d4c8493dbb2d95f5af300..ac1ee98131d564aef1e130ae724ef776f985cd9a 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -558,13 +558,13 @@ virNetworkDefParseString;
 virNetworkDefUpdateSection;
 virNetworkDeleteConfig;
 virNetworkFindByName;
-virNetworkFindByUUID;
 virNetworkForwardTypeToString;
 virNetworkIpDefNetmask;
 virNetworkIpDefPrefix;
 virNetworkLoadAllConfigs;
 virNetworkLoadAllState;
 virNetworkObjAssignDef;
+virNetworkObjFindByUUID;
 virNetworkObjFree;
 virNetworkObjGetPersistentDef;
 virNetworkObjIsDuplicate;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4b74b688c9ab0198db6888fa9de2f693ce4d5993..054c9aa2d1929393647a7cd932f0cc1430d57249 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -130,7 +130,7 @@ networkObjFromNetwork(virNetworkPtr net)
     char uuidstr[VIR_UUID_STRING_BUFLEN];
 
     networkDriverLock();
-    network = virNetworkFindByUUID(driver->networks, net->uuid);
+    network = virNetworkObjFindByUUID(driver->networks, net->uuid);
     networkDriverUnlock();
 
     if (!network) {
@@ -2476,7 +2476,7 @@ static virNetworkPtr networkLookupByUUID(virConnectPtr conn,
     virNetworkPtr ret = NULL;
 
     networkDriverLock();
-    network = virNetworkFindByUUID(driver->networks, uuid);
+    network = virNetworkObjFindByUUID(driver->networks, uuid);
     networkDriverUnlock();
     if (!network) {
         char uuidstr[VIR_UUID_STRING_BUFLEN];
@@ -3071,7 +3071,7 @@ networkUndefine(virNetworkPtr net)
 
     networkDriverLock();
 
-    network = virNetworkFindByUUID(driver->networks, net->uuid);
+    network = virNetworkObjFindByUUID(driver->networks, net->uuid);
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
                        "%s", _("no network with matching uuid"));
@@ -3144,7 +3144,7 @@ networkUpdate(virNetworkPtr net,
 
     networkDriverLock();
 
-    network = virNetworkFindByUUID(driver->networks, net->uuid);
+    network = virNetworkObjFindByUUID(driver->networks, net->uuid);
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
                        "%s", _("no network with matching uuid"));
@@ -3301,7 +3301,7 @@ static int networkCreate(virNetworkPtr net)
     virObjectEventPtr event = NULL;
 
     networkDriverLock();
-    network = virNetworkFindByUUID(driver->networks, net->uuid);
+    network = virNetworkObjFindByUUID(driver->networks, net->uuid);
 
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
@@ -3336,7 +3336,7 @@ static int networkDestroy(virNetworkPtr net)
     virObjectEventPtr event = NULL;
 
     networkDriverLock();
-    network = virNetworkFindByUUID(driver->networks, net->uuid);
+    network = virNetworkObjFindByUUID(driver->networks, net->uuid);
 
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
@@ -3462,7 +3462,7 @@ static int networkSetAutostart(virNetworkPtr net,
     int ret = -1;
 
     networkDriverLock();
-    network = virNetworkFindByUUID(driver->networks, net->uuid);
+    network = virNetworkObjFindByUUID(driver->networks, net->uuid);
 
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,

diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 7ab37b334e3f947ee5d6eea7dc3a0af889d7d35f..c1eebfe35c2d23cdf186c372e1ed26a38c8a8fcb 100644 (file)
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -472,7 +472,7 @@ static virNetworkPtr parallelsNetworkLookupByUUID(virConnectPtr conn,
     virNetworkPtr ret = NULL;
 
     parallelsDriverLock(privconn);
-    network = virNetworkFindByUUID(privconn->networks, uuid);
+    network = virNetworkObjFindByUUID(privconn->networks, uuid);
     parallelsDriverUnlock(privconn);
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
@@ -522,7 +522,7 @@ static char *parallelsNetworkGetXMLDesc(virNetworkPtr net,
     virCheckFlags(VIR_NETWORK_XML_INACTIVE, NULL);
 
     parallelsDriverLock(privconn);
-    network = virNetworkFindByUUID(privconn->networks, net->uuid);
+    network = virNetworkObjFindByUUID(privconn->networks, net->uuid);
     parallelsDriverUnlock(privconn);
 
     if (!network) {
@@ -546,7 +546,7 @@ static int parallelsNetworkIsActive(virNetworkPtr net)
     int ret = -1;
 
     parallelsDriverLock(privconn);
-    obj = virNetworkFindByUUID(privconn->networks, net->uuid);
+    obj = virNetworkObjFindByUUID(privconn->networks, net->uuid);
     parallelsDriverUnlock(privconn);
     if (!obj) {
         virReportError(VIR_ERR_NO_NETWORK, NULL);
@@ -567,7 +567,7 @@ static int parallelsNetworkIsPersistent(virNetworkPtr net)
     int ret = -1;
 
     parallelsDriverLock(privconn);
-    obj = virNetworkFindByUUID(privconn->networks, net->uuid);
+    obj = virNetworkObjFindByUUID(privconn->networks, net->uuid);
     parallelsDriverUnlock(privconn);
     if (!obj) {
         virReportError(VIR_ERR_NO_NETWORK, NULL);
@@ -589,7 +589,7 @@ static int parallelsNetworkGetAutostart(virNetworkPtr net,
     int ret = -1;
 
     parallelsDriverLock(privconn);
-    network = virNetworkFindByUUID(privconn->networks, net->uuid);
+    network = virNetworkObjFindByUUID(privconn->networks, net->uuid);
     parallelsDriverUnlock(privconn);
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 7afa2f0e8086c1e3d2ed6d09afbdee1ab1222a42..6393288cde201f856deaf001520b2b9d07617d44 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -3499,7 +3499,7 @@ static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn,
     virNetworkPtr ret = NULL;
 
     testDriverLock(privconn);
-    net = virNetworkFindByUUID(privconn->networks, uuid);
+    net = virNetworkObjFindByUUID(privconn->networks, uuid);
     testDriverUnlock(privconn);
 
     if (net == NULL) {
@@ -3654,7 +3654,7 @@ static int testNetworkIsActive(virNetworkPtr net)
     int ret = -1;
 
     testDriverLock(privconn);
-    obj = virNetworkFindByUUID(privconn->networks, net->uuid);
+    obj = virNetworkObjFindByUUID(privconn->networks, net->uuid);
     testDriverUnlock(privconn);
     if (!obj) {
         virReportError(VIR_ERR_NO_NETWORK, NULL);
@@ -3675,7 +3675,7 @@ static int testNetworkIsPersistent(virNetworkPtr net)
     int ret = -1;
 
     testDriverLock(privconn);
-    obj = virNetworkFindByUUID(privconn->networks, net->uuid);
+    obj = virNetworkObjFindByUUID(privconn->networks, net->uuid);
     testDriverUnlock(privconn);
     if (!obj) {
         virReportError(VIR_ERR_NO_NETWORK, NULL);
@@ -3812,7 +3812,7 @@ testNetworkUpdate(virNetworkPtr net,
 
     testDriverLock(privconn);
 
-    network = virNetworkFindByUUID(privconn->networks, net->uuid);
+    network = virNetworkObjFindByUUID(privconn->networks, net->uuid);
     if (!network) {
         virReportError(VIR_ERR_NO_NETWORK,
                        "%s", _("no network with matching uuid"));

diff --git a/tests/objectlocking.ml b/tests/objectlocking.ml
index 247673190ee21f5f61f113b3bdbcad8ba328883c..b5ea6cb19f309ca32d8c2dec01064bcf957d1c1d 100644 (file)
--- a/tests/objectlocking.ml
+++ b/tests/objectlocking.ml
@@ -61,7 +61,7 @@ let lockedObjMethods = [
    "virDomainFindByName";
    "virDomainAssignDef";
 
-   "virNetworkFindByUUID";
+   "virNetworkObjFindByUUID";
    "virNetworkFindByName";
    "virNetworkAssignDef";