From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 22 Jan 2013 14:28:38 +0000 (+0100)
Subject: conf: Improve error messages if parsing of vCPU count fails
X-Git-Tag: v1.0.2-rc1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23b9502bfc5d61af88a02f5811e89a47361b233a;p=thirdparty%2Flibvirt.git

conf: Improve error messages if parsing of vCPU count fails
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 26e0b8eb6e..ad6a14a4e7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9087,7 +9087,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
         def->maxvcpus = count;
         if (count == 0 || (unsigned short) count != count) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("invalid maxvcpus %lu"), count);
+                           _("invalid maximum number of vCPUs '%lu'"), count);
             goto error;
         }
     }
@@ -9103,13 +9103,14 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
         def->vcpus = count;
         if (count == 0 || (unsigned short) count != count) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("invalid current vcpus %lu"), count);
+                           _("invalid current number of vCPUs '%lu'"), count);
             goto error;
         }
 
         if (def->maxvcpus < count) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("maxvcpus must not be less than current vcpus (%d < %lu)"),
+                           _("maxvcpus must not be less than current vcpus "
+                             "(%d < %lu)"),
                            def->maxvcpus, count);
             goto error;
         }