|
 |
43fe83 |
From 1ebdad03cee5cafeb0c7d6991d3936426b246090 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <1ebdad03cee5cafeb0c7d6991d3936426b246090.1383922566.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
43fe83 |
Date: Fri, 8 Nov 2013 12:33:27 +0100
|
|
|
43fe83 |
Subject: [PATCH] cpu: x86: Clean up error messages in x86VendorLoad()
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1008989
|
|
|
43fe83 |
|
|
|
43fe83 |
Avoid a line exceeding 80 characters and change argument alignment in
|
|
|
43fe83 |
two error messages.
|
|
|
43fe83 |
|
|
|
43fe83 |
(cherry picked from commit f2eca83cb66c0f930acf48fd5db6c864d5bb3ba9)
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/cpu/cpu_x86.c | 7 ++++---
|
|
|
43fe83 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
index 610f028..9653160 100644
|
|
|
43fe83 |
--- a/src/cpu/cpu_x86.c
|
|
|
43fe83 |
+++ b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
@@ -542,8 +542,8 @@ x86VendorLoad(xmlXPathContextPtr ctxt,
|
|
|
43fe83 |
|
|
|
43fe83 |
vendor->name = virXPathString("string(@name)", ctxt);
|
|
|
43fe83 |
if (!vendor->name) {
|
|
|
43fe83 |
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
43fe83 |
- "%s", _("Missing CPU vendor name"));
|
|
|
43fe83 |
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
43fe83 |
+ _("Missing CPU vendor name"));
|
|
|
43fe83 |
goto ignore;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -556,7 +556,8 @@ x86VendorLoad(xmlXPathContextPtr ctxt,
|
|
|
43fe83 |
string = virXPathString("string(@string)", ctxt);
|
|
|
43fe83 |
if (!string) {
|
|
|
43fe83 |
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
43fe83 |
- _("Missing vendor string for CPU vendor %s"), vendor->name);
|
|
|
43fe83 |
+ _("Missing vendor string for CPU vendor %s"),
|
|
|
43fe83 |
+ vendor->name);
|
|
|
43fe83 |
goto ignore;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
if (strlen(string) != VENDOR_STRING_LENGTH) {
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4.2
|
|
|
43fe83 |
|