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

test_driver: s/virNetworkObjList/virNetworkObjListPtr/ 

In order to hide the object internals (and use just accessors
everywhere), lets store a pointer to the object, instead of object
itself.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-02-23 15:54:54 +01:00
parent bbbc7e41e0
commit a9ba542272
1 changed files with 51 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/test/test_driver.c
View File

@ -101,7 +101,7 @@ struct _testConn {
virDomainXMLOptionPtr xmlopt; virDomainXMLOptionPtr xmlopt;
virNodeInfo nodeInfo; virNodeInfo nodeInfo;
virDomainObjListPtr domains; virDomainObjListPtr domains;
virNetworkObjList networks; virNetworkObjListPtr networks;
virInterfaceObjList ifaces; virInterfaceObjList ifaces;
bool transaction_running; bool transaction_running;
virInterfaceObjList backupIfaces; virInterfaceObjList backupIfaces;
@ -115,7 +115,7 @@ struct _testConn {
virObjectEventStatePtr eventState; virObjectEventStatePtr eventState;
}; };
typedef struct _testConn testConn; typedef struct _testConn testConn;
typedef struct _testConn *testConnPtr; typedef testConn *testConnPtr;
static testConn defaultConn; static testConn defaultConn;
static int defaultConnections; static int defaultConnections;
@ -724,7 +724,8 @@ testOpenDefault(virConnectPtr conn)
if (!(privconn->eventState = virObjectEventStateNew())) if (!(privconn->eventState = virObjectEventStateNew()))
goto error; goto error;
if (!(privconn->domains = virDomainObjListNew())) if (!(privconn->domains = virDomainObjListNew()) ||
VIR_ALLOC(privconn->networks) < 0)
goto error; goto error;
memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo)); memmove(&privconn->nodeInfo, &defaultNodeInfo, sizeof(defaultNodeInfo));
@ -781,7 +782,7 @@ testOpenDefault(virConnectPtr conn)
if (!(netdef = virNetworkDefParseString(defaultNetworkXML))) if (!(netdef = virNetworkDefParseString(defaultNetworkXML)))
goto error; goto error;
if (!(netobj = virNetworkAssignDef(&privconn->networks, netdef, false))) { if (!(netobj = virNetworkAssignDef(privconn->networks, netdef, false))) {
virNetworkDefFree(netdef); virNetworkDefFree(netdef);
goto error; goto error;
} }
@ -829,7 +830,8 @@ testOpenDefault(virConnectPtr conn)
error: error:
virObjectUnref(privconn->domains); virObjectUnref(privconn->domains);
virNetworkObjListFree(&privconn->networks); virNetworkObjListFree(privconn->networks);
VIR_FREE(privconn->networks);
virInterfaceObjListFree(&privconn->ifaces); virInterfaceObjListFree(&privconn->ifaces);
virStoragePoolObjListFree(&privconn->pools); virStoragePoolObjListFree(&privconn->pools);
virNodeDeviceObjListFree(&privconn->devs); virNodeDeviceObjListFree(&privconn->devs);
@ -1148,7 +1150,7 @@ testParseNetworks(testConnPtr privconn,
if (!def) if (!def)
goto error; goto error;
if (!(obj = virNetworkAssignDef(&privconn->networks, def, false))) { if (!(obj = virNetworkAssignDef(privconn->networks, def, false))) {
virNetworkDefFree(def); virNetworkDefFree(def);
goto error; goto error;
} }
@ -1411,7 +1413,8 @@ testOpenFromFile(virConnectPtr conn, const char *file)
testDriverLock(privconn); testDriverLock(privconn);
conn->privateData = privconn; conn->privateData = privconn;
if (!(privconn->domains = virDomainObjListNew())) if (!(privconn->domains = virDomainObjListNew()) ||
VIR_ALLOC(privconn->networks) < 0)
goto error; goto error;
if (!(privconn->caps = testBuildCapabilities(conn))) if (!(privconn->caps = testBuildCapabilities(conn)))
@ -1463,7 +1466,8 @@ testOpenFromFile(virConnectPtr conn, const char *file)
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
xmlFreeDoc(doc); xmlFreeDoc(doc);
virObjectUnref(privconn->domains); virObjectUnref(privconn->domains);
virNetworkObjListFree(&privconn->networks); virNetworkObjListFree(privconn->networks);
VIR_FREE(privconn->networks);
virInterfaceObjListFree(&privconn->ifaces); virInterfaceObjListFree(&privconn->ifaces);
virStoragePoolObjListFree(&privconn->pools); virStoragePoolObjListFree(&privconn->pools);
VIR_FREE(privconn->path); VIR_FREE(privconn->path);
@ -1589,7 +1593,8 @@ static int testConnectClose(virConnectPtr conn)
virObjectUnref(privconn->xmlopt); virObjectUnref(privconn->xmlopt);
virObjectUnref(privconn->domains); virObjectUnref(privconn->domains);
virNodeDeviceObjListFree(&privconn->devs); virNodeDeviceObjListFree(&privconn->devs);
virNetworkObjListFree(&privconn->networks); virNetworkObjListFree(privconn->networks);
VIR_FREE(privconn->networks);
virInterfaceObjListFree(&privconn->ifaces); virInterfaceObjListFree(&privconn->ifaces);
virStoragePoolObjListFree(&privconn->pools); virStoragePoolObjListFree(&privconn->pools);
virObjectEventStateFree(privconn->eventState); virObjectEventStateFree(privconn->eventState);
@ -3494,7 +3499,7 @@ static virNetworkPtr testNetworkLookupByUUID(virConnectPtr conn,
virNetworkPtr ret = NULL; virNetworkPtr ret = NULL;
testDriverLock(privconn); testDriverLock(privconn);
net = virNetworkFindByUUID(&privconn->networks, uuid); net = virNetworkFindByUUID(privconn->networks, uuid);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (net == NULL) { if (net == NULL) {
@ -3518,7 +3523,7 @@ static virNetworkPtr testNetworkLookupByName(virConnectPtr conn,
virNetworkPtr ret = NULL; virNetworkPtr ret = NULL;
testDriverLock(privconn); testDriverLock(privconn);
net = virNetworkFindByName(&privconn->networks, name); net = virNetworkFindByName(privconn->networks, name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (net == NULL) { if (net == NULL) {
@ -3542,11 +3547,11 @@ static int testConnectNumOfNetworks(virConnectPtr conn)
size_t i; size_t i;
testDriverLock(privconn); testDriverLock(privconn);
for (i = 0; i < privconn->networks.count; i++) { for (i = 0; i < privconn->networks->count; i++) {
virNetworkObjLock(privconn->networks.objs[i]); virNetworkObjLock(privconn->networks->objs[i]);
if (virNetworkObjIsActive(privconn->networks.objs[i])) if (virNetworkObjIsActive(privconn->networks->objs[i]))
numActive++; numActive++;
virNetworkObjUnlock(privconn->networks.objs[i]); virNetworkObjUnlock(privconn->networks->objs[i]);
} }
testDriverUnlock(privconn); testDriverUnlock(privconn);
@ -3560,14 +3565,14 @@ static int testConnectListNetworks(virConnectPtr conn, char **const names, int n
testDriverLock(privconn); testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames); memset(names, 0, sizeof(*names)*nnames);
for (i = 0; i < privconn->networks.count && n < nnames; i++) { for (i = 0; i < privconn->networks->count && n < nnames; i++) {
virNetworkObjLock(privconn->networks.objs[i]); virNetworkObjLock(privconn->networks->objs[i]);
if (virNetworkObjIsActive(privconn->networks.objs[i]) && if (virNetworkObjIsActive(privconn->networks->objs[i]) &&
VIR_STRDUP(names[n++], privconn->networks.objs[i]->def->name) < 0) { VIR_STRDUP(names[n++], privconn->networks->objs[i]->def->name) < 0) {
virNetworkObjUnlock(privconn->networks.objs[i]); virNetworkObjUnlock(privconn->networks->objs[i]);
goto error; goto error;
} }
virNetworkObjUnlock(privconn->networks.objs[i]); virNetworkObjUnlock(privconn->networks->objs[i]);
} }
testDriverUnlock(privconn); testDriverUnlock(privconn);
@ -3587,11 +3592,11 @@ static int testConnectNumOfDefinedNetworks(virConnectPtr conn)
size_t i; size_t i;
testDriverLock(privconn); testDriverLock(privconn);
for (i = 0; i < privconn->networks.count; i++) { for (i = 0; i < privconn->networks->count; i++) {
virNetworkObjLock(privconn->networks.objs[i]); virNetworkObjLock(privconn->networks->objs[i]);
if (!virNetworkObjIsActive(privconn->networks.objs[i])) if (!virNetworkObjIsActive(privconn->networks->objs[i]))
numInactive++; numInactive++;
virNetworkObjUnlock(privconn->networks.objs[i]); virNetworkObjUnlock(privconn->networks->objs[i]);
} }
testDriverUnlock(privconn); testDriverUnlock(privconn);
@ -3605,14 +3610,14 @@ static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names
testDriverLock(privconn); testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames); memset(names, 0, sizeof(*names)*nnames);
for (i = 0; i < privconn->networks.count && n < nnames; i++) { for (i = 0; i < privconn->networks->count && n < nnames; i++) {
virNetworkObjLock(privconn->networks.objs[i]); virNetworkObjLock(privconn->networks->objs[i]);
if (!virNetworkObjIsActive(privconn->networks.objs[i]) && if (!virNetworkObjIsActive(privconn->networks->objs[i]) &&
VIR_STRDUP(names[n++], privconn->networks.objs[i]->def->name) < 0) { VIR_STRDUP(names[n++], privconn->networks->objs[i]->def->name) < 0) {
virNetworkObjUnlock(privconn->networks.objs[i]); virNetworkObjUnlock(privconn->networks->objs[i]);
goto error; goto error;
} }
virNetworkObjUnlock(privconn->networks.objs[i]); virNetworkObjUnlock(privconn->networks->objs[i]);
} }
testDriverUnlock(privconn); testDriverUnlock(privconn);
@ -3636,7 +3641,7 @@ testConnectListAllNetworks(virConnectPtr conn,
virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1);
testDriverLock(privconn); testDriverLock(privconn);
ret = virNetworkObjListExport(conn, &privconn->networks, nets, NULL, flags); ret = virNetworkObjListExport(conn, privconn->networks, nets, NULL, flags);
testDriverUnlock(privconn); testDriverUnlock(privconn);
return ret; return ret;
@ -3649,7 +3654,7 @@ static int testNetworkIsActive(virNetworkPtr net)
int ret = -1; int ret = -1;
testDriverLock(privconn); testDriverLock(privconn);
obj = virNetworkFindByUUID(&privconn->networks, net->uuid); obj = virNetworkFindByUUID(privconn->networks, net->uuid);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (!obj) { if (!obj) {
virReportError(VIR_ERR_NO_NETWORK, NULL); virReportError(VIR_ERR_NO_NETWORK, NULL);
@ -3670,7 +3675,7 @@ static int testNetworkIsPersistent(virNetworkPtr net)
int ret = -1; int ret = -1;
testDriverLock(privconn); testDriverLock(privconn);
obj = virNetworkFindByUUID(&privconn->networks, net->uuid); obj = virNetworkFindByUUID(privconn->networks, net->uuid);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (!obj) { if (!obj) {
virReportError(VIR_ERR_NO_NETWORK, NULL); virReportError(VIR_ERR_NO_NETWORK, NULL);
@ -3697,7 +3702,7 @@ static virNetworkPtr testNetworkCreateXML(virConnectPtr conn, const char *xml)
if ((def = virNetworkDefParseString(xml)) == NULL) if ((def = virNetworkDefParseString(xml)) == NULL)
goto cleanup; goto cleanup;
if (!(net = virNetworkAssignDef(&privconn->networks, def, true))) if (!(net = virNetworkAssignDef(privconn->networks, def, true)))
goto cleanup; goto cleanup;
def = NULL; def = NULL;
net->active = 1; net->active = 1;
@ -3731,7 +3736,7 @@ virNetworkPtr testNetworkDefineXML(virConnectPtr conn, const char *xml)
if ((def = virNetworkDefParseString(xml)) == NULL) if ((def = virNetworkDefParseString(xml)) == NULL)
goto cleanup; goto cleanup;
if (!(net = virNetworkAssignDef(&privconn->networks, def, false))) if (!(net = virNetworkAssignDef(privconn->networks, def, false)))
goto cleanup; goto cleanup;
def = NULL; def = NULL;
@ -3759,8 +3764,7 @@ static int testNetworkUndefine(virNetworkPtr network)
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(&privconn->networks, privnet = virNetworkFindByName(privconn->networks, network->name);
network->name);
if (privnet == NULL) { if (privnet == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
@ -3777,8 +3781,7 @@ static int testNetworkUndefine(virNetworkPtr network)
VIR_NETWORK_EVENT_UNDEFINED, VIR_NETWORK_EVENT_UNDEFINED,
0); 0);
virNetworkRemoveInactive(&privconn->networks, virNetworkRemoveInactive(privconn->networks, privnet);
privnet);
privnet = NULL; privnet = NULL;
ret = 0; ret = 0;
@ -3809,7 +3812,7 @@ testNetworkUpdate(virNetworkPtr net,
testDriverLock(privconn); testDriverLock(privconn);
network = virNetworkFindByUUID(&privconn->networks, net->uuid); network = virNetworkFindByUUID(privconn->networks, net->uuid);
if (!network) { if (!network) {
virReportError(VIR_ERR_NO_NETWORK, virReportError(VIR_ERR_NO_NETWORK,
"%s", _("no network with matching uuid")); "%s", _("no network with matching uuid"));
@ -3849,8 +3852,7 @@ static int testNetworkCreate(virNetworkPtr network)
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(&privconn->networks, privnet = virNetworkFindByName(privconn->networks, network->name);
network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -3886,8 +3888,7 @@ static int testNetworkDestroy(virNetworkPtr network)
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(&privconn->networks, privnet = virNetworkFindByName(privconn->networks, network->name);
network->name);
if (privnet == NULL) { if (privnet == NULL) {
virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
@ -3899,8 +3900,7 @@ static int testNetworkDestroy(virNetworkPtr network)
VIR_NETWORK_EVENT_STOPPED, VIR_NETWORK_EVENT_STOPPED,
0); 0);
if (!privnet->persistent) { if (!privnet->persistent) {
virNetworkRemoveInactive(&privconn->networks, virNetworkRemoveInactive(privconn->networks, privnet);
privnet);
privnet = NULL; privnet = NULL;
} }
ret = 0; ret = 0;
@ -3924,8 +3924,7 @@ static char *testNetworkGetXMLDesc(virNetworkPtr network,
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(&privconn->networks, privnet = virNetworkFindByName(privconn->networks, network->name);
network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -3947,8 +3946,7 @@ static char *testNetworkGetBridgeName(virNetworkPtr network) {
virNetworkObjPtr privnet; virNetworkObjPtr privnet;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(&privconn->networks, privnet = virNetworkFindByName(privconn->networks, network->name);
network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -3979,8 +3977,7 @@ static int testNetworkGetAutostart(virNetworkPtr network,
int ret = -1; int ret = -1;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(&privconn->networks, privnet = virNetworkFindByName(privconn->networks, network->name);
network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {
@ -4005,8 +4002,7 @@ static int testNetworkSetAutostart(virNetworkPtr network,
int ret = -1; int ret = -1;
testDriverLock(privconn); testDriverLock(privconn);
privnet = virNetworkFindByName(&privconn->networks, privnet = virNetworkFindByName(privconn->networks, network->name);
network->name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (privnet == NULL) { if (privnet == NULL) {