From: Doug Goldstein <cardoe@cardoe.com>
Date: Mon, 12 Aug 2013 20:42:42 +0000 (-0500)
Subject: VMX: Improve disk parse error for unknown values
X-Git-Tag: v1.1.2-rc1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23263af678887d60aa0fc973047e23a61d8b003f;p=thirdparty%2Flibvirt.git

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.
---

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 28a6f103b2..35afe26dea 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 {