|
 |
43fe83 |
From f564bc7136bd832cba97926f9a5020a090561434 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <f564bc7136bd832cba97926f9a5020a090561434.1383922565.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
43fe83 |
Date: Fri, 8 Nov 2013 12:33:16 +0100
|
|
|
43fe83 |
Subject: [PATCH] conf: Mark user provided strings in error messages when
|
|
|
43fe83 |
parsing XML
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1008989
|
|
|
43fe83 |
|
|
|
43fe83 |
Use apostrophes to denote user provided option names when parsing the
|
|
|
43fe83 |
domain XML.
|
|
|
43fe83 |
|
|
|
43fe83 |
(cherry picked from commit 59ae97b4d5305e8e13c1ec05f4a22c61a8ef5b4b)
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/conf/domain_conf.c | 5 ++---
|
|
|
43fe83 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
43fe83 |
index a1d7385..79dfb05 100644
|
|
|
43fe83 |
--- a/src/conf/domain_conf.c
|
|
|
43fe83 |
+++ b/src/conf/domain_conf.c
|
|
|
43fe83 |
@@ -11316,8 +11316,7 @@ virDomainDefParseXML(xmlDocPtr xml,
|
|
|
43fe83 |
int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name);
|
|
|
43fe83 |
if (val < 0) {
|
|
|
43fe83 |
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
43fe83 |
- _("unexpected feature %s"),
|
|
|
43fe83 |
- nodes[i]->name);
|
|
|
43fe83 |
+ _("unexpected feature '%s'"), nodes[i]->name);
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
def->features |= (1 << val);
|
|
|
43fe83 |
@@ -11327,7 +11326,7 @@ virDomainDefParseXML(xmlDocPtr xml,
|
|
|
43fe83 |
int eoi;
|
|
|
43fe83 |
if ((eoi = virDomainFeatureStateTypeFromString(tmp)) <= 0) {
|
|
|
43fe83 |
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
43fe83 |
- _("unknown value for attribute eoi: %s"),
|
|
|
43fe83 |
+ _("unknown value for attribute eoi: '%s'"),
|
|
|
43fe83 |
tmp);
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4.2
|
|
|
43fe83 |
|