[PATCH] domain_conf: Replace the name string with 'vcpu' if it is 'vcpus'
From: Liao Pingfang <liao.pingfang@zte.com.cn> 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> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0c883cd..5dcc836 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20050,7 +20050,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; } -- 2.9.5
On 7/1/20 8:39 PM, Yi Wang wrote:
From: Liao Pingfang <liao.pingfang@zte.com.cn>
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>
On 7/2/20 1:37 PM, Daniel Henrique Barboza wrote:
On 7/1/20 8:39 PM, Yi Wang wrote:
From: Liao Pingfang <liao.pingfang@zte.com.cn>
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>
Pushed now. Michal
participants (3)
-
Daniel Henrique Barboza -
Michal Privoznik -
Yi Wang