External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vz: make prlsdkGetDisk more generic

Browse Source 
Current implementation works with hard disks only. This patch
adds support for any disk device (cdroms and hdds right now).

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2016-04-20 17:05:29 +03:00 committed by Maxim Nestratov
parent 2e6ff2da75
commit f6e13453e7
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/vz/vz_sdk.c
View File

@ -3291,29 +3291,35 @@ static PRL_HANDLE
prlsdkGetDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool isCt)
{
PRL_RESULT pret;
PRL_UINT32 hddCount;
PRL_UINT32 num;
size_t i;
PRL_HANDLE hdd = PRL_INVALID_HANDLE;
PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
int bus;
char *dst = NULL;
PRL_DEVICE_TYPE devType;
pret = PrlVmCfg_GetHardDisksCount(sdkdom, &hddCount);
if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
devType = PDE_HARD_DISK;
else
devType = PDE_OPTICAL_DISK;
pret = PrlVmCfg_GetDevsCountByType(sdkdom, devType, &num);
prlsdkCheckRetGoto(pret, error);
for (i = 0; i < hddCount; ++i) {
pret = PrlVmCfg_GetHardDisk(sdkdom, i, &hdd);
for (i = 0; i < num; ++i) {
pret = PrlVmCfg_GetDevByType(sdkdom, devType, i, &sdkdisk);
prlsdkCheckRetGoto(pret, error);
if (prlsdkGetDiskId(hdd, isCt, &bus, &dst) < 0)
if (prlsdkGetDiskId(sdkdisk, isCt, &bus, &dst) < 0)
goto error;
if (disk->bus == bus && STREQ(disk->dst, dst)) {
VIR_FREE(dst);
return hdd;
return sdkdisk;
}
PrlHandle_Free(hdd);
hdd = PRL_INVALID_HANDLE;
PrlHandle_Free(sdkdisk);
sdkdisk = PRL_INVALID_HANDLE;
VIR_FREE(dst);
}
@ -3324,7 +3330,7 @@ prlsdkGetDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool isCt)
error:
VIR_FREE(dst);
PrlHandle_Free(hdd);
PrlHandle_Free(sdkdisk);
return PRL_INVALID_HANDLE;
}