From: Liao Pingfang <liao.pingfang@zte.com.cn>
Date: Wed, 1 Jul 2020 23:39:40 +0000 (+0800)
Subject: domain_conf: Replace the name string with 'vcpu' if it is 'vcpus'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7ea55a481dd45f09b54425005362533ecc800cd2;p=libvirt.git

domain_conf: Replace the name string with 'vcpu' if it is 'vcpus'

If the name is 'vcpus', we will get 'vcpussched' instead of 'vcpusched'
in the error message as following:

	... 19155 : vcpussched attributes 'vcpus' must not overlap

So we use 'vcpu' to replace 'vcpus'.

Signed-off-by: Liao Pingfang <liao.pingfang@zte.com.cn>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2f4528d336..e9803b8514 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19981,7 +19981,7 @@ virDomainThreadSchedParseHelper(xmlNodePtr node,
         if (sched->policy != VIR_PROC_POLICY_NONE) {
             virReportError(VIR_ERR_XML_DETAIL,
                            _("%ssched attributes 'vcpus' must not overlap"),
-                           name);
+                           STREQ(name, "vcpus") ? "vcpu" : name);
             return -1;
         }