openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michal Privoznik 2015-02-23 17:05:52 +01:00
parent 82f240ae56
commit 53cae19561
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/network_conf.c
View File

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

4
src/conf/network_conf.h
View File

@ -303,8 +303,8 @@ bool virNetworkObjTaint(virNetworkObjPtr obj,
virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets, virNetworkObjPtr virNetworkObjFindByUUID(virNetworkObjListPtr nets,
const unsigned char *uuid); const unsigned char *uuid);
virNetworkObjPtr virNetworkFindByName(virNetworkObjListPtr nets, virNetworkObjPtr virNetworkObjFindByName(virNetworkObjListPtr nets,
const char *name); const char *name);
void virNetworkDefFree(virNetworkDefPtr def); void virNetworkDefFree(virNetworkDefPtr def);

2
src/libvirt_private.syms
View File

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

10
src/network/bridge_driver.c
View File

@ -2505,7 +2505,7 @@ static virNetworkPtr networkLookupByName(virConnectPtr conn,
virNetworkPtr ret = NULL; virNetworkPtr ret = NULL;
networkDriverLock(); networkDriverLock();
network = virNetworkFindByName(driver->networks, name); network = virNetworkObjFindByName(driver->networks, name);
networkDriverUnlock(); networkDriverUnlock();
if (!network) { if (!network) {
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,
@ -3792,7 +3792,7 @@ networkAllocateActualDevice(virDomainDefPtr dom,
iface->data.network.actual = NULL; iface->data.network.actual = NULL;
networkDriverLock(); networkDriverLock();
network = virNetworkFindByName(driver->networks, iface->data.network.name); network = virNetworkObjFindByName(driver->networks, iface->data.network.name);
networkDriverUnlock(); networkDriverUnlock();
if (!network) { if (!network) {
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,
@ -4201,7 +4201,7 @@ networkNotifyActualDevice(virDomainDefPtr dom,
return 0; return 0;
networkDriverLock(); networkDriverLock();
network = virNetworkFindByName(driver->networks, iface->data.network.name); network = virNetworkObjFindByName(driver->networks, iface->data.network.name);
networkDriverUnlock(); networkDriverUnlock();
if (!network) { if (!network) {
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,
@ -4401,7 +4401,7 @@ networkReleaseActualDevice(virDomainDefPtr dom,
return 0; return 0;
networkDriverLock(); networkDriverLock();
network = virNetworkFindByName(driver->networks, iface->data.network.name); network = virNetworkObjFindByName(driver->networks, iface->data.network.name);
networkDriverUnlock(); networkDriverUnlock();
if (!network) { if (!network) {
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,
@ -4560,7 +4560,7 @@ networkGetNetworkAddress(const char *netname, char **netaddr)
*netaddr = NULL; *netaddr = NULL;
networkDriverLock(); networkDriverLock();
network = virNetworkFindByName(driver->networks, netname); network = virNetworkObjFindByName(driver->networks, netname);
networkDriverUnlock(); networkDriverUnlock();
if (!network) { if (!network) {
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,

2
src/parallels/parallels_network.c
View File

@ -496,7 +496,7 @@ static virNetworkPtr parallelsNetworkLookupByName(virConnectPtr conn,
virNetworkPtr ret = NULL; virNetworkPtr ret = NULL;
parallelsDriverLock(privconn); parallelsDriverLock(privconn);
network = virNetworkFindByName(privconn->networks, name); network = virNetworkObjFindByName(privconn->networks, name);
parallelsDriverUnlock(privconn); parallelsDriverUnlock(privconn);
if (!network) { if (!network) {
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,

16
src/test/test_driver.c
View File

@ -3523,7 +3523,7 @@ static virNetworkPtr testNetworkLookupByName(virConnectPtr conn,
virNetworkPtr ret = NULL; virNetworkPtr ret = NULL;
testDriverLock(privconn); testDriverLock(privconn);
net = virNetworkFindByName(privconn->networks, name); net = virNetworkObjFindByName(privconn->networks, name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (net == NULL) { if (net == NULL) {
@ -3764,7 +3764,7 @@ static int testNetworkUndefine(virNetworkPtr network)
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(privconn->networks, network->name); privnet = virNetworkObjFindByName(privconn->networks, network->name);
if (privnet == NULL) { if (privnet == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
@ -3852,7 +3852,7 @@ static int testNetworkCreate(virNetworkPtr network)
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(privconn->networks, network->name); privnet = virNetworkObjFindByName(privconn->networks, network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -3888,7 +3888,7 @@ static int testNetworkDestroy(virNetworkPtr network)
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(privconn->networks, network->name); privnet = virNetworkObjFindByName(privconn->networks, network->name);
if (privnet == NULL) { if (privnet == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
@ -3924,7 +3924,7 @@ static char *testNetworkGetXMLDesc(virNetworkPtr network,
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(privconn->networks, network->name); privnet = virNetworkObjFindByName(privconn->networks, network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -3946,7 +3946,7 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) {
virNetworkObjPtr privnet; virNetworkObjPtr privnet;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(privconn->networks, network->name); privnet = virNetworkObjFindByName(privconn->networks, network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -3977,7 +3977,7 @@ static int testNetworkGetAutostart(virNetworkPtr network,
int ret = -1; int ret = -1;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(privconn->networks, network->name); privnet = virNetworkObjFindByName(privconn->networks, network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -4002,7 +4002,7 @@ static int testNetworkSetAutostart(virNetworkPtr network,
int ret = -1; int ret = -1;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(privconn->networks, network->name); privnet = virNetworkObjFindByName(privconn->networks, network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {

2
tests/objectlocking.ml
View File

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