From nobody Mon Feb 9 01:00:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1623333593; cv=none; d=zohomail.com; s=zohoarc; b=U1saEA+464jeq77AuhSiH6ajnU97Ni8u2Lx/oZ2Ku4+3tcxGGW52+vrGirJWJtf/Qwg/u0MshKSVBgpIhic6HzBTaeC9vIYnsNCynmbAPNFPH5eXGKtmDQaR1cv21Mvre/MZqVFozj7+n1mV9cxxmXMaBXh56cmYtnuEHa41tI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623333593; 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=whiUnpd8XTTDxMS+PK/u/rdj1y2dng+MLTf1Ny1Ypr8=; b=T1yqzge8GDQJow/rW6Aukl5Oc8zGABpJTa9Pp9CGgUdFCvqpNHZMy74zTO4VawfX+G9LfkrADzcLBAPzCmbUvaP8J20mNabKxn/yuPIdp5avVqOL3gk6aLJGRzTdJ0ereR5KcO64jfmCR4LDDxABwHAELkvvy8xKbO+0RqVNJ30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623333592993349.29643465043785; Thu, 10 Jun 2021 06:59:52 -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-316-JiVLAlTQMBe9-CAp1XiZyQ-1; Thu, 10 Jun 2021 09:59:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95C991850605; Thu, 10 Jun 2021 13:59:45 +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 738069CA0; Thu, 10 Jun 2021 13:59:45 +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 32B131809CBD; Thu, 10 Jun 2021 13:59:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15ADvVTJ005348 for ; Thu, 10 Jun 2021 09:57:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3527219C46; Thu, 10 Jun 2021 13:57:31 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACA5D19C45 for ; Thu, 10 Jun 2021 13:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623333591; 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=whiUnpd8XTTDxMS+PK/u/rdj1y2dng+MLTf1Ny1Ypr8=; b=B7JH8x35e85UtozgutSpD3IWDDDJRfKKsQfEmge9Duqvq2KoUP0HeqOzZfmzN/16D4C86b r/Kpt1pEvUqDoj0UOzSiiZxW+yCbaYTlvCwLDwymyFkdTKCzh9gYGwikKKcB3si1FgtxbJ 09MQIxGEnnDRwPzTQhnwXTBrYMh4tbw= X-MC-Unique: JiVLAlTQMBe9-CAp1XiZyQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v2 07/10] numa_conf: Rename virDomainNumaInterconnect* to virNumaInterconnect* Date: Thu, 10 Jun 2021 15:57:16 +0200 Message-Id: <687ab798091ccf60aa2f4671a3160b32126bed84.1623333178.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.79 on 10.5.11.11 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's nothing domain specific about NUMA interconnects. Rename the virDomainNumaInterconnect* structures and enums to virNumaInterconnect*. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/numa_conf.c | 56 ++++++++++++++++++++-------------------- src/conf/numa_conf.h | 24 ++++++++--------- src/libvirt_private.syms | 4 +-- src/qemu/qemu_command.c | 10 +++---- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index c4f2ef10c1..c8b3212e5c 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -74,15 +74,15 @@ VIR_ENUM_IMPL(virNumaCachePolicy, "writethrough", ); =20 -VIR_ENUM_IMPL(virDomainMemoryLatency, - VIR_DOMAIN_MEMORY_LATENCY_LAST, +VIR_ENUM_IMPL(virMemoryLatency, + VIR_MEMORY_LATENCY_LAST, "none", "access", "read", "write" ); =20 -typedef struct _virDomainNumaInterconnect virDomainNumaInterconnect; +typedef struct _virNumaInterconnect virNumaInterconnect; =20 typedef struct _virDomainNumaNode virDomainNumaNode; =20 @@ -110,14 +110,14 @@ struct _virDomainNuma { } *mem_nodes; /* guest node configuration */ size_t nmem_nodes; =20 - struct _virDomainNumaInterconnect { - virDomainNumaInterconnectType type; /* whether structure describe= s latency - or bandwidth */ + struct _virNumaInterconnect { + virNumaInterconnectType type; /* whether structure describes late= ncy + or bandwidth */ unsigned int initiator; /* the initiator NUMA node */ unsigned int target; /* the target NUMA node */ unsigned int cache; /* the target cache on @target; if 0 then = the memory on @target */ - virDomainMemoryLatency accessType; /* what type of access is defi= ned */ + virMemoryLatency accessType; /* what type of access is defined */ unsigned long value; /* value itself */ } *interconnects; size_t ninterconnects; @@ -1021,24 +1021,24 @@ virDomainNumaDefParseXML(virDomainNuma *def, &interconnect)) < 0) return -1; =20 - def->interconnects =3D g_new0(virDomainNumaInterconnect, n); + def->interconnects =3D g_new0(virNumaInterconnect, n); for (i =3D 0; i < n; i++) { - virDomainNumaInterconnectType type; + virNumaInterconnectType type; unsigned int initiator; unsigned int target; unsigned int cache =3D 0; - virDomainMemoryLatency accessType; + virMemoryLatency accessType; unsigned long long value; =20 if (virXMLNodeNameEqual(interconnect[i], "latency")) { - type =3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY; + type =3D VIR_NUMA_INTERCONNECT_TYPE_LATENCY; =20 if (virXMLPropULongLong(interconnect[i], "value", 10, VIR_XML_PROP_REQUIRED, &value) < 0) return -1; } else if (virXMLNodeNameEqual(interconnect[i], "bandwidth")) { VIR_XPATH_NODE_AUTORESTORE(ctxt) - type =3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH; + type =3D VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH; =20 ctxt->node =3D interconnect[i]; =20 @@ -1062,13 +1062,13 @@ virDomainNumaDefParseXML(virDomainNuma *def, return -1; =20 if (virXMLPropEnum(interconnect[i], "type", - virDomainMemoryLatencyTypeFromString, + virMemoryLatencyTypeFromString, VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, &accessType) < 0) return -1; =20 - def->interconnects[i] =3D (virDomainNumaInterconnect) {type, initi= ator, target, - cache, access= Type, value}; + def->interconnects[i] =3D (virNumaInterconnect) {type, initiator, = target, + cache, accessType, = value}; def->ninterconnects++; } =20 @@ -1135,13 +1135,13 @@ virDomainNumaDefFormatXML(virBuffer *buf, } =20 for (i =3D 0; i < def->ninterconnects; i++) { - virDomainNumaInterconnect *l =3D &def->interconnects[i]; + virNumaInterconnect *l =3D &def->interconnects[i]; =20 switch (l->type) { - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: + case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: virBufferAddLit(buf, "accessType= ), + virMemoryLatencyTypeToString(l->accessType), l->value); =20 - if (l->type =3D=3D VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH) + if (l->type =3D=3D VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH) virBufferAddLit(buf, " unit=3D'KiB'"); virBufferAddLit(buf, "/>\n"); } @@ -1213,7 +1213,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) } =20 for (i =3D 0; i < def->ninterconnects; i++) { - const virDomainNumaInterconnect *l =3D &def->interconnects[i]; + const virNumaInterconnect *l =3D &def->interconnects[i]; =20 if (l->initiator >=3D def->nmem_nodes) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -1249,7 +1249,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) } =20 for (j =3D 0; j < i; j++) { - const virDomainNumaInterconnect *ll =3D &def->interconnects[j]; + const virNumaInterconnect *ll =3D &def->interconnects[j]; =20 if (l->type =3D=3D ll->type && l->initiator =3D=3D ll->initiator && @@ -1720,20 +1720,20 @@ virDomainNumaGetNodeInitiator(const virDomainNuma *= numa, /* For the rest, "NUMA node that has best performance (the lowest * latency or largest bandwidth) to this NUMA node." */ for (i =3D 0; i < numa->ninterconnects; i++) { - const virDomainNumaInterconnect *l =3D &numa->interconnects[i]; + const virNumaInterconnect *l =3D &numa->interconnects[i]; =20 if (l->target !=3D node) continue; =20 switch (l->type) { - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: + case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: if (l->value < minLatency) { minLatency =3D l->value; candidateLatency =3D l->initiator; } break; =20 - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH: + case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH: if (l->value > maxBandwidth) { maxBandwidth =3D l->value; candidateBandwidth =3D l->initiator; @@ -1762,14 +1762,14 @@ virDomainNumaGetInterconnectsCount(const virDomainN= uma *numa) int virDomainNumaGetInterconnect(const virDomainNuma *numa, size_t i, - virDomainNumaInterconnectType *type, + virNumaInterconnectType *type, unsigned int *initiator, unsigned int *target, unsigned int *cache, - virDomainMemoryLatency *accessType, + virMemoryLatency *accessType, unsigned long *value) { - const virDomainNumaInterconnect *l; + const virNumaInterconnect *l; =20 if (!numa || i >=3D numa->ninterconnects) return -1; diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 9dee4f3a40..5baf68348c 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -69,19 +69,19 @@ typedef enum { VIR_ENUM_DECL(virNumaCachePolicy); =20 typedef enum { - VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY, - VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH, -} virDomainNumaInterconnectType; + VIR_NUMA_INTERCONNECT_TYPE_LATENCY, + VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH, +} virNumaInterconnectType; =20 typedef enum { - VIR_DOMAIN_MEMORY_LATENCY_NONE =3D 0, /* No memory latency defined */ - VIR_DOMAIN_MEMORY_LATENCY_ACCESS, /* Access latency */ - VIR_DOMAIN_MEMORY_LATENCY_READ, /* Read latency */ - VIR_DOMAIN_MEMORY_LATENCY_WRITE, /* Write latency */ + VIR_MEMORY_LATENCY_NONE =3D 0, /* No memory latency defined */ + VIR_MEMORY_LATENCY_ACCESS, /* Access latency */ + VIR_MEMORY_LATENCY_READ, /* Read latency */ + VIR_MEMORY_LATENCY_WRITE, /* Write latency */ =20 - VIR_DOMAIN_MEMORY_LATENCY_LAST -} virDomainMemoryLatency; -VIR_ENUM_DECL(virDomainMemoryLatency); + VIR_MEMORY_LATENCY_LAST +} virMemoryLatency; +VIR_ENUM_DECL(virMemoryLatency); =20 =20 virDomainNuma *virDomainNumaNew(void); @@ -243,11 +243,11 @@ size_t virDomainNumaGetInterconnectsCount(const virDo= mainNuma *numa); =20 int virDomainNumaGetInterconnect(const virDomainNuma *numa, size_t i, - virDomainNumaInterconnectType *type, + virNumaInterconnectType *type, unsigned int *initiator, unsigned int *target, unsigned int *cache, - virDomainMemoryLatency *accessType, + virMemoryLatency *accessType, unsigned long *value); =20 typedef struct _virNumaDistance virNumaDistance; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index abe4525163..d7f6dfd534 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -863,8 +863,6 @@ virNodeDeviceGetParentName; # conf/numa_conf.h virDomainMemoryAccessTypeFromString; virDomainMemoryAccessTypeToString; -virDomainMemoryLatencyTypeFromString; -virDomainMemoryLatencyTypeToString; virDomainNumaCheckABIStability; virDomainNumaEquals; virDomainNumaFillCPUsInNode; @@ -909,6 +907,8 @@ virDomainNumatunePlacementTypeFromString; virDomainNumatunePlacementTypeToString; virDomainNumatuneSet; virDomainNumatuneSpecifiedMaxNode; +virMemoryLatencyTypeFromString; +virMemoryLatencyTypeToString; virNumaCacheAssociativityTypeFromString; virNumaCacheAssociativityTypeToString; virNumaCacheFormat; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c3523c25c7..ef964a855e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7273,11 +7273,11 @@ qemuBuildNumaHMATCommandLine(virCommand *cmd, nlatencies =3D virDomainNumaGetInterconnectsCount(def->numa); for (i =3D 0; i < nlatencies; i++) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - virDomainNumaInterconnectType type; + virNumaInterconnectType type; unsigned int initiator; unsigned int target; unsigned int cache; - virDomainMemoryLatency accessType; + virMemoryLatency accessType; unsigned long value; const char *hierarchyStr; const char *accessStr; @@ -7288,16 +7288,16 @@ qemuBuildNumaHMATCommandLine(virCommand *cmd, return -1; =20 hierarchyStr =3D qemuDomainMemoryHierarchyTypeToString(cache); - accessStr =3D virDomainMemoryLatencyTypeToString(accessType); + accessStr =3D virMemoryLatencyTypeToString(accessType); virBufferAsprintf(&buf, "hmat-lb,initiator=3D%u,target=3D%u,hierarchy=3D= %s,data-type=3D%s-", initiator, target, hierarchyStr, accessStr); =20 switch (type) { - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY: + case VIR_NUMA_INTERCONNECT_TYPE_LATENCY: virBufferAsprintf(&buf, "latency,latency=3D%lu", value); break; - case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH: + case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH: virBufferAsprintf(&buf, "bandwidth,bandwidth=3D%luK", value); break; } --=20 2.31.1