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

b0f414c6 · Matthias Bolte · 02988742 · b0f414c6
显示空白变更内容
内联并排

Showing with 8 addition and 4 deletion

src/esx/esx_vmx.c src/esx/esx_vmx.c +8 -4

未找到文件。
--- a/src/esx/esx_vmx.c
+++ b/src/esx/esx_vmx.c
@@ -1542,16 +1542,20 @@ esxVMX_ParseDisk(esxVI_Context *ctx, virConfPtr conf, int device, int bus,
        if (virFileHasSuffix(fileName, ".vmdk")) {
            if (deviceType != NULL) {
                if (bus == VIR_DOMAIN_DISK_BUS_SCSI &&
-                    STRCASENEQ(deviceType, "scsi-hardDisk")) {
+                    STRCASENEQ(deviceType, "scsi-hardDisk") &&
+                    STRCASENEQ(deviceType, "disk")) {
                    ESX_ERROR(VIR_ERR_INTERNAL_ERROR,
                              _("Expecting VMX entry '%s' to be 'scsi-hardDisk' "
-                                "but found '%s'"), deviceType_name, deviceType);
+                                "or 'disk' but found '%s'"), deviceType_name,
+                              deviceType);
                    goto cleanup;
                } 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,
                              _("Expecting VMX entry '%s' to be 'ata-hardDisk' "
-                                "but found '%s'"), deviceType_name, deviceType);
+                                "or 'disk' but found '%s'"), deviceType_name,
+                              deviceType);
                    goto cleanup;
                }
            }