External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vz: introduce vzsdk disk id function

Browse Source 
Our intention is to use disk bus and disk target name pair
as disk id instead of name returned by PrlVmDev_GetFriendlyName.
We already have the code that extracts this pair from vzsdk
data. Let's factor it out into a function.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2016-04-14 13:45:03 +03:00 committed by Maxim Nestratov
parent 3583e75d7e
commit bc5f2aab6d
1 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/vz/vz_sdk.c
View File

@ -485,6 +485,45 @@ prlsdkAddDomainVideoInfo(PRL_HANDLE sdkdom, virDomainDefPtr def)
return -1; return -1;
} }
static int
prlsdkGetDiskId(PRL_HANDLE disk, bool isCt, int *bus, char **dst)
{
PRL_RESULT pret;
PRL_UINT32 pos, ifType;
pret = PrlVmDev_GetStackIndex(disk, &pos);
prlsdkCheckRetExit(pret, -1);
/* Let physical devices added to CT look like SATA disks */
if (isCt) {
ifType = PMS_SATA_DEVICE;
} else {
pret = PrlVmDev_GetIfaceType(disk, &ifType);
prlsdkCheckRetExit(pret, -1);
}
switch (ifType) {
case PMS_IDE_DEVICE:
*bus = VIR_DOMAIN_DISK_BUS_IDE;
*dst = virIndexToDiskName(pos, "hd");
break;
case PMS_SCSI_DEVICE:
*bus = VIR_DOMAIN_DISK_BUS_SCSI;
*dst = virIndexToDiskName(pos, "sd");
break;
case PMS_SATA_DEVICE:
*bus = VIR_DOMAIN_DISK_BUS_SATA;
*dst = virIndexToDiskName(pos, "sd");
break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown disk bus: %X"), ifType);
return -1;
}
return 0;
}
static int static int
prlsdkGetDiskInfo(vzDriverPtr driver, prlsdkGetDiskInfo(vzDriverPtr driver,
PRL_HANDLE prldisk, PRL_HANDLE prldisk,
@ -495,9 +534,8 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
char *buf = NULL; char *buf = NULL;
PRL_RESULT pret; PRL_RESULT pret;
PRL_UINT32 emulatedType; PRL_UINT32 emulatedType;
PRL_UINT32 ifType;
PRL_UINT32 pos;
virDomainDeviceDriveAddressPtr address; virDomainDeviceDriveAddressPtr address;
int busIdx, devIdx;
int ret = -1; int ret = -1;
pret = PrlVmDev_GetEmulatedType(prldisk, &emulatedType); pret = PrlVmDev_GetEmulatedType(prldisk, &emulatedType);
@ -530,49 +568,16 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
if (virDomainDiskSetSource(disk, buf) < 0) if (virDomainDiskSetSource(disk, buf) < 0)
goto cleanup; goto cleanup;
/* Let physical devices added to CT look like SATA disks */ if (prlsdkGetDiskId(prldisk, isCt, &disk->bus, &disk->dst) < 0)
if (isCt) { goto cleanup;
ifType = PMS_SATA_DEVICE;
} else {
pret = PrlVmDev_GetIfaceType(prldisk, &ifType);
prlsdkCheckRetGoto(pret, cleanup);
}
pret = PrlVmDev_GetStackIndex(prldisk, &pos); if (virDiskNameToBusDeviceIndex(disk, &busIdx, &devIdx) < 0)
prlsdkCheckRetGoto(pret, cleanup); goto cleanup;
address = &disk->info.addr.drive; address = &disk->info.addr.drive;
switch (ifType) { address->bus = busIdx;
case PMS_IDE_DEVICE:
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
disk->dst = virIndexToDiskName(pos, "hd");
address->bus = pos / 2;
address->target = 0; address->target = 0;
address->unit = pos % 2; address->unit = devIdx;
break;
case PMS_SCSI_DEVICE:
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
disk->dst = virIndexToDiskName(pos, "sd");
address->bus = 0;
address->target = 0;
address->unit = pos;
break;
case PMS_SATA_DEVICE:
disk->bus = VIR_DOMAIN_DISK_BUS_SATA;
disk->dst = virIndexToDiskName(pos, "sd");
address->bus = 0;
address->target = 0;
address->unit = pos;
break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown disk bus: %X"), ifType);
goto cleanup;
break;
}
if (!disk->dst)
goto cleanup;
disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;