External/libvirt
1
0
Fork 0
Code

vz: cleanup: remove trivial function

Browse Source
This commit is contained in:
Nikolay Shirokovskiy 2016-04-14 13:45:06 +03:00 committed by Maxim Nestratov
parent 29439964a2
commit 88c6c4ab96
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/vz/vz_sdk.c
View File

@ -3169,25 +3169,6 @@ int prlsdkDetachNet(vzDriverPtr driver,
return ret; return ret;
} }
static int prlsdkDelDisk(PRL_HANDLE sdkdom, int idx)
{
int ret = -1;
PRL_RESULT pret;
PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
pret = PrlVmCfg_GetHardDisk(sdkdom, idx, &sdkdisk);
prlsdkCheckRetGoto(pret, cleanup);
pret = PrlVmDev_Remove(sdkdisk);
prlsdkCheckRetGoto(pret, cleanup);
ret = 0;
cleanup:
PrlHandle_Free(sdkdisk);
return ret;
}
static int prlsdkAddDisk(vzDriverPtr driver, static int prlsdkAddDisk(vzDriverPtr driver,
PRL_HANDLE sdkdom, PRL_HANDLE sdkdom,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
@ -3809,6 +3790,7 @@ prlsdkDetachDomainHardDisks(PRL_HANDLE sdkdom)
PRL_UINT32 hddCount; PRL_UINT32 hddCount;
PRL_UINT32 i; PRL_UINT32 i;
PRL_HANDLE job; PRL_HANDLE job;
PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
job = PrlVm_BeginEdit(sdkdom); job = PrlVm_BeginEdit(sdkdom);
if (PRL_FAILED(waitJob(job))) if (PRL_FAILED(waitJob(job)))
@ -3818,17 +3800,24 @@ prlsdkDetachDomainHardDisks(PRL_HANDLE sdkdom)
prlsdkCheckRetGoto(pret, cleanup); prlsdkCheckRetGoto(pret, cleanup);
for (i = 0; i < hddCount; ++i) { for (i = 0; i < hddCount; ++i) {
ret = prlsdkDelDisk(sdkdom, i); pret = PrlVmCfg_GetHardDisk(sdkdom, i, &sdkdisk);
if (ret) prlsdkCheckRetGoto(pret, cleanup);
goto cleanup;
pret = PrlVmDev_Remove(sdkdisk);
prlsdkCheckRetGoto(pret, cleanup);
PrlHandle_Free(sdkdisk);
sdkdisk = PRL_INVALID_HANDLE;
} }
job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE); job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE);
if (PRL_FAILED(waitJob(job))) if (PRL_FAILED(waitJob(job)))
ret = -1; goto cleanup;
ret = 0;
cleanup: cleanup:
PrlHandle_Free(sdkdisk);
return ret; return ret;
} }