[libvirt] [PATCH 1/5] VMX: Improve disk parse error for unknown values

Previously the error message showed the following: error: internal error: Invalid or not yet handled value 'auto detect' for VMX entry 'ide0:0.fileName' This left the user unsure if it was a CD-ROM or a disk device that they needed to fix. Now the error shows: error: internal error: Invalid or not yet handled value 'auto detect' for VMX entry 'ide0:0.fileName' for device type 'cdrom-raw' Which should hopefully make it easier to see the issue with the VMX configuration. --- src/vmx/vmx.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 28a6f10..35afe26 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2184,8 +2184,10 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto ignore; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid or not yet handled value '%s' for VMX entry " - "'%s'"), fileName, fileName_name); + _("Invalid or not yet handled value '%s' " + "for VMX entry '%s' for device type '%s'"), + fileName, fileName_name, + deviceType ? deviceType : "unknown"); goto cleanup; } } else if (device == VIR_DOMAIN_DISK_DEVICE_CDROM) { @@ -2220,8 +2222,10 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con fileName = NULL; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid or not yet handled value '%s' for VMX entry " - "'%s'"), fileName, fileName_name); + _("Invalid or not yet handled value '%s' " + "for VMX entry '%s' for device type '%s'"), + fileName, fileName_name, + deviceType ? deviceType : "unknown"); goto cleanup; } } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { @@ -2248,8 +2252,10 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con fileName = NULL; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid or not yet handled value '%s' for VMX entry " - "'%s'"), fileName, fileName_name); + _("Invalid or not yet handled value '%s' " + "for VMX entry '%s' for device type '%s'"), + fileName, fileName_name, + deviceType ? deviceType : "unknown"); goto cleanup; } } else { -- 1.8.1.5