8:57 a.m.
There's nothing domain specific about NUMA interconnects. Rename
the virDomainNumaInterconnect* structures and enums to
virNumaInterconnect*.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
Reviewed-by: Martin Kletzander <mkletzan(a)redhat.com>
---
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",
);
-VIR_ENUM_IMPL(virDomainMemoryLatency,
- VIR_DOMAIN_MEMORY_LATENCY_LAST,
+VIR_ENUM_IMPL(virMemoryLatency,
+ VIR_MEMORY_LATENCY_LAST,
"none",
"access",
"read",
"write"
);
-typedef struct _virDomainNumaInterconnect virDomainNumaInterconnect;
+typedef struct _virNumaInterconnect virNumaInterconnect;
typedef struct _virDomainNumaNode virDomainNumaNode;
@@ -110,14 +110,14 @@ struct _virDomainNuma {
} *mem_nodes; /* guest node configuration */
size_t nmem_nodes;
- struct _virDomainNumaInterconnect {
- virDomainNumaInterconnectType type; /* whether structure describes latency
- or bandwidth */
+ struct _virNumaInterconnect {
+ virNumaInterconnectType type; /* whether structure describes latency
+ 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 defined */
+ 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;
- def->interconnects = g_new0(virDomainNumaInterconnect, n);
+ def->interconnects = g_new0(virNumaInterconnect, n);
for (i = 0; i < n; i++) {
- virDomainNumaInterconnectType type;
+ virNumaInterconnectType type;
unsigned int initiator;
unsigned int target;
unsigned int cache = 0;
- virDomainMemoryLatency accessType;
+ virMemoryLatency accessType;
unsigned long long value;
if (virXMLNodeNameEqual(interconnect[i], "latency")) {
- type = VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY;
+ type = VIR_NUMA_INTERCONNECT_TYPE_LATENCY;
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 = VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH;
+ type = VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH;
ctxt->node = interconnect[i];
@@ -1062,13 +1062,13 @@ virDomainNumaDefParseXML(virDomainNuma *def,
return -1;
if (virXMLPropEnum(interconnect[i], "type",
- virDomainMemoryLatencyTypeFromString,
+ virMemoryLatencyTypeFromString,
VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
&accessType) < 0)
return -1;
- def->interconnects[i] = (virDomainNumaInterconnect) {type, initiator, target,
- cache, accessType, value};
+ def->interconnects[i] = (virNumaInterconnect) {type, initiator, target,
+ cache, accessType, value};
def->ninterconnects++;
}
@@ -1135,13 +1135,13 @@ virDomainNumaDefFormatXML(virBuffer *buf,
}
for (i = 0; i < def->ninterconnects; i++) {
- virDomainNumaInterconnect *l = &def->interconnects[i];
+ virNumaInterconnect *l = &def->interconnects[i];
switch (l->type) {
- case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY:
+ case VIR_NUMA_INTERCONNECT_TYPE_LATENCY:
virBufferAddLit(buf, "<latency");
break;
- case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH:
+ case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH:
virBufferAddLit(buf, "<bandwidth");
}
@@ -1157,10 +1157,10 @@ virDomainNumaDefFormatXML(virBuffer *buf,
virBufferAsprintf(buf,
" type='%s' value='%lu'",
- virDomainMemoryLatencyTypeToString(l->accessType),
+ virMemoryLatencyTypeToString(l->accessType),
l->value);
- if (l->type == VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH)
+ if (l->type == VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH)
virBufferAddLit(buf, " unit='KiB'");
virBufferAddLit(buf, "/>\n");
}
@@ -1213,7 +1213,7 @@ virDomainNumaDefValidate(const virDomainNuma *def)
}
for (i = 0; i < def->ninterconnects; i++) {
- const virDomainNumaInterconnect *l = &def->interconnects[i];
+ const virNumaInterconnect *l = &def->interconnects[i];
if (l->initiator >= def->nmem_nodes) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -1249,7 +1249,7 @@ virDomainNumaDefValidate(const virDomainNuma *def)
}
for (j = 0; j < i; j++) {
- const virDomainNumaInterconnect *ll = &def->interconnects[j];
+ const virNumaInterconnect *ll = &def->interconnects[j];
if (l->type == ll->type &&
l->initiator == 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 = 0; i < numa->ninterconnects; i++) {
- const virDomainNumaInterconnect *l = &numa->interconnects[i];
+ const virNumaInterconnect *l = &numa->interconnects[i];
if (l->target != node)
continue;
switch (l->type) {
- case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY:
+ case VIR_NUMA_INTERCONNECT_TYPE_LATENCY:
if (l->value < minLatency) {
minLatency = l->value;
candidateLatency = l->initiator;
}
break;
- case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH:
+ case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH:
if (l->value > maxBandwidth) {
maxBandwidth = l->value;
candidateBandwidth = l->initiator;
@@ -1762,14 +1762,14 @@ virDomainNumaGetInterconnectsCount(const virDomainNuma *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;
if (!numa || i >= 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);
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;
typedef enum {
- VIR_DOMAIN_MEMORY_LATENCY_NONE = 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 = 0, /* No memory latency defined */
+ VIR_MEMORY_LATENCY_ACCESS, /* Access latency */
+ VIR_MEMORY_LATENCY_READ, /* Read latency */
+ VIR_MEMORY_LATENCY_WRITE, /* Write latency */
- VIR_DOMAIN_MEMORY_LATENCY_LAST
-} virDomainMemoryLatency;
-VIR_ENUM_DECL(virDomainMemoryLatency);
+ VIR_MEMORY_LATENCY_LAST
+} virMemoryLatency;
+VIR_ENUM_DECL(virMemoryLatency);
virDomainNuma *virDomainNumaNew(void);
@@ -243,11 +243,11 @@ size_t virDomainNumaGetInterconnectsCount(const virDomainNuma
*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);
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 = virDomainNumaGetInterconnectsCount(def->numa);
for (i = 0; i < nlatencies; i++) {
g_auto(virBuffer) buf = 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;
hierarchyStr = qemuDomainMemoryHierarchyTypeToString(cache);
- accessStr = virDomainMemoryLatencyTypeToString(accessType);
+ accessStr = virMemoryLatencyTypeToString(accessType);
virBufferAsprintf(&buf,
"hmat-lb,initiator=%u,target=%u,hierarchy=%s,data-type=%s-",
initiator, target, hierarchyStr, accessStr);
switch (type) {
- case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_LATENCY:
+ case VIR_NUMA_INTERCONNECT_TYPE_LATENCY:
virBufferAsprintf(&buf, "latency,latency=%lu", value);
break;
- case VIR_DOMAIN_NUMA_INTERCONNECT_TYPE_BANDWIDTH:
+ case VIR_NUMA_INTERCONNECT_TYPE_BANDWIDTH:
virBufferAsprintf(&buf, "bandwidth,bandwidth=%luK", value);
break;
}
--
2.31.1