提交 88c6c4ab 编写于 作者: N Nikolay Shirokovskiy 提交者: Maxim Nestratov

vz: cleanup: remove trivial function

上级 29439964
...@@ -3169,25 +3169,6 @@ int prlsdkDetachNet(vzDriverPtr driver, ...@@ -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) ...@@ -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) ...@@ -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;
cleanup: ret = 0;
cleanup:
PrlHandle_Free(sdkdisk);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册