From f564bc7136bd832cba97926f9a5020a090561434 Mon Sep 17 00:00:00 2001
Message-Id: <f564bc7136bd832cba97926f9a5020a090561434.1383922565.git.jdenemar@redhat.com>
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 8 Nov 2013 12:33:16 +0100
Subject: [PATCH] conf: Mark user provided strings in error messages when
 parsing XML

https://bugzilla.redhat.com/show_bug.cgi?id=1008989

Use apostrophes to denote user provided option names when parsing the
domain XML.

(cherry picked from commit 59ae97b4d5305e8e13c1ec05f4a22c61a8ef5b4b)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/conf/domain_conf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a1d7385..79dfb05 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -11316,8 +11316,7 @@ virDomainDefParseXML(xmlDocPtr xml,
         int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name);
         if (val < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("unexpected feature %s"),
-                           nodes[i]->name);
+                           _("unexpected feature '%s'"), nodes[i]->name);
             goto error;
         }
         def->features |= (1 << val);
@@ -11327,7 +11326,7 @@ virDomainDefParseXML(xmlDocPtr xml,
                 int eoi;
                 if ((eoi = virDomainFeatureStateTypeFromString(tmp)) <= 0) {
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                   _("unknown value for attribute eoi: %s"),
+                                   _("unknown value for attribute eoi: '%s'"),
                                    tmp);
                     goto error;
                 }
-- 
1.8.4.2