From nobody Sat May 4 05:56:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593647592; cv=none; d=zohomail.com; s=zohoarc; b=Hu+Qmxa6vR48h676cW5zqzyAHlF5uXZ0XlKdIhMSj1wQgmGYGuAHpCedUl3mUXDGyQf5ltP0L0LPP4WmUsq/0ELp/swwlLZobGN8hL665tnPhzskoGZqKJe4jtVcUlLbg+YrqV2K5oPFEg+x79SgmMnvC5TJif7L2VTIuHOIn7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593647592; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=P4DrLyJdMo23tYPJfvFo5AFsCWEWFcNK/kCfOjPOnKE=; b=dtuL0L6xcM5vLFCnjK85WVVlHCTitGHzIzwkPuL4wYtaSqYIa2S212NYUsNiM3D6wZNY5EdWOHbzX+EuXqf3UPc2ly8ESXFS+793+9m6vIouDhqNnKBtKB/RAHDy7bQkp0IMIuHHiz/a9HyyDjz5tW1lTvTNsgNI8Am1IoZIbU0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1593647592219178.89509277092236; Wed, 1 Jul 2020 16:53:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-501-3RHdTGbAPeiw3YjvqCddug-1; Wed, 01 Jul 2020 19:53:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B65C819057A1; Wed, 1 Jul 2020 23:53:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 436C0610B0; Wed, 1 Jul 2020 23:52:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 62CA71809547; Wed, 1 Jul 2020 23:52:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 061NqpHn027939 for ; Wed, 1 Jul 2020 19:52:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id CE023201B087; Wed, 1 Jul 2020 23:52:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C98632029F79 for ; Wed, 1 Jul 2020 23:52:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E3ED78007AC for ; Wed, 1 Jul 2020 23:52:48 +0000 (UTC) Received: from mxct.zte.com.cn (mx7.zte.com.cn [202.103.147.169]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-240-XPWsTNzDMbW8-3skOeQIJQ-1; Wed, 01 Jul 2020 19:52:46 -0400 Received: from mse-fl1.zte.com.cn (unknown [10.30.14.238]) by Forcepoint Email with ESMTPS id CDF19C00A207A8528BC3 for ; Thu, 2 Jul 2020 07:36:42 +0800 (CST) Received: from notes_smtp.zte.com.cn (notessmtp.zte.com.cn [10.30.1.239]) by mse-fl1.zte.com.cn with ESMTP id 061NafOb082619 for ; Thu, 2 Jul 2020 07:36:41 +0800 (GMT-8) (envelope-from wang.yi59@zte.com.cn) Received: from fox-host8.localdomain ([10.74.120.8]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2020070207370661-4151748 ; Thu, 2 Jul 2020 07:37:06 +0800 X-MC-Unique: 3RHdTGbAPeiw3YjvqCddug-1 X-MC-Unique: XPWsTNzDMbW8-3skOeQIJQ-1 From: Yi Wang To: libvir-list@redhat.com Subject: [PATCH] domain_conf: Replace the name string with 'vcpu' if it is 'vcpus' Date: Thu, 2 Jul 2020 07:39:40 +0800 Message-Id: <1593646780-8655-1-git-send-email-wang.yi59@zte.com.cn> X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2020-07-02 07:37:06, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2020-07-02 07:36:45, Serialize complete at 2020-07-02 07:36:45 X-MAIL: mse-fl1.zte.com.cn 061NafOb082619 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: wang.yi59@zte.com.cn, Liao Pingfang , wang.liang82@zte.com.cn, xue.zhihong@zte.com.cn X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Liao Pingfang 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 Reviewed-by: Daniel Henrique Barboza --- 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 !=3D VIR_PROC_POLICY_NONE) { virReportError(VIR_ERR_XML_DETAIL, _("%ssched attributes 'vcpus' must not overlap"= ), - name); + STREQ(name, "vcpus") ? "vcpu" : name); return -1; } =20 --=20 2.9.5