From nobody Sun Feb 8 17:46:30 2026 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593006583; cv=none; d=zohomail.com; s=zohoarc; b=Lq6MtkJb2QWdK/uprlBcB+YwA44BsZPEvwR9Ui5as0wRdF+gaalW/hSx6Vrc1tqn1Tz7T17W4MJ66iujH+DZgSA1FPT3v0zwC1RifewZNUm/k04SPjCx2nlnHE8TzH7cZCA+6fJItgQ2GdqxnGEjWOv5VpOXElnZ6oYNNvwynYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593006583; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b+KurRtly8rxCMZgryoaiWF6J6UQuHZKRvbII911PN8=; b=LxhqYkSVbnoLwZRr6MwlJ1BW3BeUsrHNozOU6WbYWnkiPNBqQ74Pc6AJE4LvWS04Ona0MsHLhmNECLfREUvlKlW4hBX5H6nYMe50BtSPOqS30yyi9PxiZS4qrHOoSjf2J8lt3RpzPffhQjsMNL3wahP5re7abfSye/wtn6TP8XA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1593006583415867.961888715698; Wed, 24 Jun 2020 06:49:43 -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-65-UEmJoVHvNRSRfoYsHUTfBA-1; Wed, 24 Jun 2020 09:49:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0B8580400A; Wed, 24 Jun 2020 13:49:33 +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 BF04E2B47E; Wed, 24 Jun 2020 13:49:33 +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 8A8BE1809561; Wed, 24 Jun 2020 13:49:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05ODnJuC015650 for ; Wed, 24 Jun 2020 09:49:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 556415D9DC; Wed, 24 Jun 2020 13:49:19 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB3505DD61 for ; Wed, 24 Jun 2020 13:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593006582; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=b+KurRtly8rxCMZgryoaiWF6J6UQuHZKRvbII911PN8=; b=C5XAFidz5hhQEsQVDB/EAhZ64dUm58KCvsGsFUO+LKMFWP6jhIujM1IMyAKtJJ7Gl/qgXm DOfV0GmRLYmxcd84quZwahzTokt0R33eOXKKnTSIaPXTpRKoFUmXXc6+WKzNFMU7ExrSl7 8O13Cj3CED6J79ANNELcgWwR2Ts/UaI= X-MC-Unique: UEmJoVHvNRSRfoYsHUTfBA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 03/13] numa_conf: Drop CPU from name of two functions Date: Wed, 24 Jun 2020 15:49:01 +0200 Message-Id: <5e133a806e59e2696a86953db02386c8e1c2cb67.1593006346.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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.84 on 10.5.11.23 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There are two functions virDomainNumaDefCPUFormatXML() and virDomainNumaDefCPUParseXML() which format and parse domain's . There is nothing CPU specific about them. Drop the infix. Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 2 +- src/conf/numa_conf.c | 8 ++++---- src/conf/numa_conf.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index e1b0a5653f..a1514c2e14 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -734,7 +734,7 @@ virCPUDefFormatBufFull(virBufferPtr buf, if (virCPUDefFormatBuf(&childrenBuf, def) < 0) goto cleanup; =20 - if (virDomainNumaDefCPUFormatXML(&childrenBuf, numa) < 0) + if (virDomainNumaDefFormatXML(&childrenBuf, numa) < 0) goto cleanup; =20 /* Put it all together */ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 65a110b16f..ce75831037 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21394,7 +21394,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (virCPUDefParseXML(ctxt, "./cpu[1]", VIR_CPU_TYPE_GUEST, &def->cpu)= < 0) goto error; =20 - if (virDomainNumaDefCPUParseXML(def->numa, ctxt) < 0) + if (virDomainNumaDefParseXML(def->numa, ctxt) < 0) goto error; =20 if (virDomainNumaGetCPUCountTotal(def->numa) > virDomainDefGetVcpusMax= (def)) { diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 21a8be2cac..2685a3e828 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -842,8 +842,8 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr d= ef, } =20 int -virDomainNumaDefCPUParseXML(virDomainNumaPtr def, - xmlXPathContextPtr ctxt) +virDomainNumaDefParseXML(virDomainNumaPtr def, + xmlXPathContextPtr ctxt) { xmlNodePtr *nodes =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt); @@ -970,8 +970,8 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, =20 =20 int -virDomainNumaDefCPUFormatXML(virBufferPtr buf, - virDomainNumaPtr def) +virDomainNumaDefFormatXML(virBufferPtr buf, + virDomainNumaPtr def) { virDomainMemoryAccess memAccess; virTristateBool discard; diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index cdf87a87e8..206dffe304 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -181,8 +181,8 @@ bool virDomainNumatuneNodesetIsAvailable(virDomainNumaP= tr numatune, bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune, int cellid); =20 -int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr c= txt); -int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def); +int virDomainNumaDefParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt= ); +int virDomainNumaDefFormatXML(virBufferPtr buf, virDomainNumaPtr def); =20 unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); =20 --=20 2.26.2