External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-01 20:05:19 +00:00
Code

vz: add serial number to disk devices

Browse Source 
vz sdk supports setting serial number only for disk devices.
Getting serial upon cdrom(for example) is error however
setting is just ignored. Let's check for disk device
explicitly for clarity in both cases.

Setting serial number for other devices is ignored
with an info note just as before.

We need usual conversion from "" to NULL in direction
vz sdk -> libvirt, because "" is not valid for libvirt
and "" means unspecifiend in vz sdk which is NULL for libvirt.
This commit is contained in:
Nikolay Shirokovskiy 2016-09-22 17:55:41 +03:00 committed by Maxim Nestratov
parent 9c2e539acd
commit d6e3af6209
2 changed files with 16 additions and 3 deletions

13
src/vz/vz_sdk.c

@ -639,6 +639,14 @@ prlsdkGetDiskInfo(vzDriverPtr driver,
disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
if (!isCdrom) {
if (!(disk->serial = prlsdkGetStringParamVar(PrlVmDevHd_GetSerialNumber, prldisk)))
goto cleanup;
if (*disk->serial == '\0')
VIR_FREE(disk->serial);
}
ret = 0;
cleanup:
@ -3492,6 +3500,11 @@ static int prlsdkConfigureDisk(vzDriverPtr driver,
pret = PrlVmDev_SetStackIndex(sdkdisk, idx);
prlsdkCheckRetGoto(pret, cleanup);
if (devType == PDE_HARD_DISK) {
pret = PrlVmDevHd_SetSerialNumber(sdkdisk, disk->serial);
prlsdkCheckRetGoto(pret, cleanup);
}
return 0;
cleanup:
PrlHandle_Free(sdkdisk);

6
src/vz/vz_utils.c

@ -323,9 +323,9 @@ vzCheckDiskUnsupportedParams(virDomainDiskDefPtr disk)
return -1;
}
if (disk->serial) {
VIR_INFO("%s", _("Setting disk serial number is not "
"supported by vz driver."));
if (disk->serial && disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) {
VIR_INFO("%s", _("Setting disk serial number is "
"supported only for disk devices."));
}
if (disk->wwn) {