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

vz: code refactoring

Browse Source 
In prlsdkAddNet() Attach/DetachNet() functions
privconn should be the first argument
This commit is contained in:
Mikhail Feoktistov 2016-03-17 13:58:23 +03:00 committed by Michal Privoznik
parent ca0c06f400
commit ad29dbb31c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vz/vz_driver.c
View File

@ -1088,7 +1088,7 @@ static int vzDomainAttachDeviceFlags(virDomainPtr dom, const char *xml,
}
break;
case VIR_DOMAIN_DEVICE_NET:
ret = prlsdkAttachNet(privdom, privconn, dev->data.net);
ret = prlsdkAttachNet(privconn, privdom, dev->data.net);
if (ret) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("network attach failed"));
@ -1165,7 +1165,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml,
}
break;
case VIR_DOMAIN_DEVICE_NET:
ret = prlsdkDetachNet(privdom, privconn, dev->data.net);
ret = prlsdkDetachNet(privconn, privdom, dev->data.net);
if (ret) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("network detach failed"));

16
src/vz/vz_sdk.c
View File

@ -2608,8 +2608,8 @@ static const char * prlsdkFormatMac(virMacAddrPtr mac, char *macstr)
return macstr;
}
static int prlsdkAddNet(PRL_HANDLE sdkdom,
vzConnPtr privconn,
static int prlsdkAddNet(vzConnPtr privconn,
PRL_HANDLE sdkdom,
virDomainNetDefPtr net,
bool isCt)
{
@ -2865,8 +2865,8 @@ prlsdkCleanupBridgedNet(vzConnPtr privconn, virDomainNetDefPtr net)
PrlHandle_Free(vnet);
}
int prlsdkAttachNet(virDomainObjPtr dom,
vzConnPtr privconn,
int prlsdkAttachNet(vzConnPtr privconn,
virDomainObjPtr dom,
virDomainNetDefPtr net)
{
int ret = -1;
@ -2883,7 +2883,7 @@ int prlsdkAttachNet(virDomainObjPtr dom,
if (PRL_FAILED(waitJob(job)))
return ret;
ret = prlsdkAddNet(privdom->sdkdom, privconn, net, IS_CT(dom->def));
ret = prlsdkAddNet(privconn, privdom->sdkdom, net, IS_CT(dom->def));
if (ret == 0) {
job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE);
if (PRL_FAILED(waitJob(job)))
@ -2930,8 +2930,8 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddrPtr mac)
return adapter;
}
int prlsdkDetachNet(virDomainObjPtr dom,
vzConnPtr privconn,
int prlsdkDetachNet(vzConnPtr privconn,
virDomainObjPtr dom,
virDomainNetDefPtr net)
{
int ret = -1;
@ -3372,7 +3372,7 @@ prlsdkDoApplyConfig(virConnectPtr conn,
}
for (i = 0; i < def->nnets; i++) {
if (prlsdkAddNet(sdkdom, conn->privateData, def->nets[i], IS_CT(def)) < 0)
if (prlsdkAddNet(conn->privateData, sdkdom, def->nets[i], IS_CT(def)) < 0)
goto error;
}

4
src/vz/vz_sdk.h
View File

@ -69,9 +69,9 @@ prlsdkDetachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk);
int
prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk, virDomainBlockStatsPtr stats);
int
prlsdkAttachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net);
prlsdkAttachNet(vzConnPtr privconn, virDomainObjPtr dom, virDomainNetDefPtr net);
int
prlsdkDetachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net);
prlsdkDetachNet(vzConnPtr privconn, virDomainObjPtr dom, virDomainNetDefPtr net);
int
prlsdkGetNetStats(virDomainObjPtr dom, const char *path, virDomainInterfaceStatsPtr stats);
int