External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

parallels_network: Adapt to new virNetworkObjList accessors

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-02-24 11:32:52 +01:00
parent d8e01f527b
commit 58092dfe87
1 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/parallels/parallels_network.c
View File

@ -357,17 +357,12 @@ int parallelsNetworkClose(virConnectPtr conn)
static int parallelsConnectNumOfNetworks(virConnectPtr conn)
{
int nactive = 0;
size_t i;
int nactive;
parallelsConnPtr privconn = conn->privateData;
parallelsDriverLock(privconn);
for (i = 0; i < privconn->networks->count; i++) {
virNetworkObjLock(privconn->networks->objs[i]);
if (virNetworkObjIsActive(privconn->networks->objs[i]))
nactive++;
virNetworkObjUnlock(privconn->networks->objs[i]);
}
nactive = virNetworkObjListNumOfNetworks(privconn->networks,
true, NULL, conn);
parallelsDriverUnlock(privconn);
return nactive;
@ -378,45 +373,24 @@ static int parallelsConnectListNetworks(virConnectPtr conn,
int nnames)
{
parallelsConnPtr privconn = conn->privateData;
int got = 0;
size_t i;
int got;
parallelsDriverLock(privconn);
for (i = 0; i < privconn->networks->count && got < nnames; i++) {
virNetworkObjLock(privconn->networks->objs[i]);
if (virNetworkObjIsActive(privconn->networks->objs[i])) {
if (VIR_STRDUP(names[got], privconn->networks->objs[i]->def->name) < 0) {
virNetworkObjUnlock(privconn->networks->objs[i]);
goto cleanup;
}
got++;
}
virNetworkObjUnlock(privconn->networks->objs[i]);
}
got = virNetworkObjListGetNames(privconn->networks,
true, names, nnames, NULL, conn);
parallelsDriverUnlock(privconn);
return got;
cleanup:
parallelsDriverUnlock(privconn);
for (i = 0; i < got; i++)
VIR_FREE(names[i]);
return -1;
}
static int parallelsConnectNumOfDefinedNetworks(virConnectPtr conn)
{
int ninactive = 0;
size_t i;
int ninactive;
parallelsConnPtr privconn = conn->privateData;
parallelsDriverLock(privconn);
for (i = 0; i < privconn->networks->count; i++) {
virNetworkObjLock(privconn->networks->objs[i]);
if (!virNetworkObjIsActive(privconn->networks->objs[i]))
ninactive++;
virNetworkObjUnlock(privconn->networks->objs[i]);
}
ninactive = virNetworkObjListNumOfNetworks(privconn->networks,
false, NULL, conn);
parallelsDriverUnlock(privconn);
return ninactive;
@ -427,29 +401,13 @@ static int parallelsConnectListDefinedNetworks(virConnectPtr conn,
int nnames)
{
parallelsConnPtr privconn = conn->privateData;
int got = 0;
size_t i;
int got;
parallelsDriverLock(privconn);
for (i = 0; i < privconn->networks->count && got < nnames; i++) {
virNetworkObjLock(privconn->networks->objs[i]);
if (!virNetworkObjIsActive(privconn->networks->objs[i])) {
if (VIR_STRDUP(names[got], privconn->networks->objs[i]->def->name) < 0) {
virNetworkObjUnlock(privconn->networks->objs[i]);
goto cleanup;
}
got++;
}
virNetworkObjUnlock(privconn->networks->objs[i]);
}
got = virNetworkObjListGetNames(privconn->networks,
false, names, nnames, NULL, conn);
parallelsDriverUnlock(privconn);
return got;
cleanup:
parallelsDriverUnlock(privconn);
for (i = 0; i < got; i++)
VIR_FREE(names[i]);
return -1;
}
static int parallelsConnectListAllNetworks(virConnectPtr conn,