External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx: Accept 'disk' as harddisk device type in .vmx files

Browse Source
This commit is contained in:
Matthias Bolte 2010-06-11 23:18:17 +02:00
parent 02988742b7
commit b0f414c67b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/esx/esx_vmx.c
View File

@ -1542,16 +1542,20 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus,
if (virFileHasSuffix(fileName, ".vmdk")) { if (virFileHasSuffix(fileName, ".vmdk")) {
if (deviceType != NULL) { if (deviceType != NULL) {
if (bus == VIR_DOMAIN_DISK_BUS_SCSI && if (bus == VIR_DOMAIN_DISK_BUS_SCSI &&
STRCASENEQ(deviceType, "scsi-hardDisk")) { STRCASENEQ(deviceType, "scsi-hardDisk") &&
STRCASENEQ(deviceType, "disk")) {
ESX_ERROR(VIR_ERR_INTERNAL_ERROR, ESX_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Expecting VMX entry '%s' to be 'scsi-hardDisk' " _("Expecting VMX entry '%s' to be 'scsi-hardDisk' "
"but found '%s'"), deviceType_name, deviceType); "or 'disk' but found '%s'"), deviceType_name,
deviceType);
goto cleanup; goto cleanup;
} else if (bus == VIR_DOMAIN_DISK_BUS_IDE && } else if (bus == VIR_DOMAIN_DISK_BUS_IDE &&
STRCASENEQ(deviceType, "ata-hardDisk")) { STRCASENEQ(deviceType, "ata-hardDisk") &&
STRCASENEQ(deviceType, "disk")) {
ESX_ERROR(VIR_ERR_INTERNAL_ERROR, ESX_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Expecting VMX entry '%s' to be 'ata-hardDisk' " _("Expecting VMX entry '%s' to be 'ata-hardDisk' "
"but found '%s'"), deviceType_name, deviceType); "or 'disk' but found '%s'"), deviceType_name,
deviceType);
goto cleanup; goto cleanup;
} }
} }