From 52c4d49ca31fefb80409ae98550a1a7e084abff5 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 13 Jun 2012 18:21:29 +0100
Subject: [PATCH] Improve error message diagnosing incorrect XML CPU mode

Tell the user what CPU mode value is wrong
(cherry picked from commit 92cbe7ae39d343b474c6aa42ffd5d76cd458fef6)
---
 src/conf/cpu_conf.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 018d57170e..b520f7c641 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -234,13 +234,15 @@ virCPUDefParseXML(const xmlNodePtr node,
             goto error;
         } else {
             def->mode = virCPUModeTypeFromString(cpuMode);
-            VIR_FREE(cpuMode);
 
             if (def->mode < 0) {
-                virCPUReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                                  _("Invalid mode attribute"));
+                virCPUReportError(VIR_ERR_INTERNAL_ERROR,
+                                  _("Invalid mode attribute '%s'"),
+                                  cpuMode);
+                VIR_FREE(cpuMode);
                 goto error;
             }
+            VIR_FREE(cpuMode);
         }
     } else {
         if (def->type == VIR_CPU_TYPE_HOST)