mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
capabilities: Rename siblings to distances
The virCapsHostNUMACellSiblingInfo structure really represents distance to other NUMA node. Rename the structure and variables of that type to make it more obvious. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
8b118c909a
commit
fe25224fda
@ -119,7 +119,7 @@ virCapabilitiesFreeHostNUMACell(virCapsHostNUMACell *cell)
|
|||||||
virCapabilitiesClearHostNUMACellCPUTopology(cell->cpus, cell->ncpus);
|
virCapabilitiesClearHostNUMACellCPUTopology(cell->cpus, cell->ncpus);
|
||||||
|
|
||||||
g_free(cell->cpus);
|
g_free(cell->cpus);
|
||||||
g_free(cell->siblings);
|
g_free(cell->distances);
|
||||||
g_free(cell->pageinfo);
|
g_free(cell->pageinfo);
|
||||||
g_free(cell);
|
g_free(cell);
|
||||||
}
|
}
|
||||||
@ -331,8 +331,8 @@ virCapabilitiesSetNetPrefix(virCaps *caps,
|
|||||||
* @mem: Total size of memory in the NUMA node (in KiB)
|
* @mem: Total size of memory in the NUMA node (in KiB)
|
||||||
* @ncpus: number of CPUs in cell
|
* @ncpus: number of CPUs in cell
|
||||||
* @cpus: array of CPU definition structures
|
* @cpus: array of CPU definition structures
|
||||||
* @nsiblings: number of sibling NUMA nodes
|
* @ndistances: number of sibling NUMA nodes
|
||||||
* @siblings: info on sibling NUMA nodes
|
* @distances: NUMA distances to other nodes
|
||||||
* @npageinfo: number of pages at node @num
|
* @npageinfo: number of pages at node @num
|
||||||
* @pageinfo: info on each single memory page
|
* @pageinfo: info on each single memory page
|
||||||
*
|
*
|
||||||
@ -348,8 +348,8 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMA *caps,
|
|||||||
unsigned long long mem,
|
unsigned long long mem,
|
||||||
int ncpus,
|
int ncpus,
|
||||||
virCapsHostNUMACellCPU **cpus,
|
virCapsHostNUMACellCPU **cpus,
|
||||||
int nsiblings,
|
int ndistances,
|
||||||
virCapsHostNUMACellSiblingInfo **siblings,
|
virCapsHostNUMACellDistance **distances,
|
||||||
int npageinfo,
|
int npageinfo,
|
||||||
virCapsHostNUMACellPageInfo **pageinfo)
|
virCapsHostNUMACellPageInfo **pageinfo)
|
||||||
{
|
{
|
||||||
@ -361,9 +361,9 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMA *caps,
|
|||||||
cell->ncpus = ncpus;
|
cell->ncpus = ncpus;
|
||||||
cell->cpus = g_steal_pointer(cpus);
|
cell->cpus = g_steal_pointer(cpus);
|
||||||
}
|
}
|
||||||
if (siblings) {
|
if (distances) {
|
||||||
cell->nsiblings = nsiblings;
|
cell->ndistances = ndistances;
|
||||||
cell->siblings = g_steal_pointer(siblings);
|
cell->distances = g_steal_pointer(distances);
|
||||||
}
|
}
|
||||||
if (pageinfo) {
|
if (pageinfo) {
|
||||||
cell->npageinfo = npageinfo;
|
cell->npageinfo = npageinfo;
|
||||||
@ -833,13 +833,13 @@ virCapabilitiesHostNUMAFormat(virBuffer *buf,
|
|||||||
cell->pageinfo[j].avail);
|
cell->pageinfo[j].avail);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cell->nsiblings) {
|
if (cell->ndistances) {
|
||||||
virBufferAddLit(buf, "<distances>\n");
|
virBufferAddLit(buf, "<distances>\n");
|
||||||
virBufferAdjustIndent(buf, 2);
|
virBufferAdjustIndent(buf, 2);
|
||||||
for (j = 0; j < cell->nsiblings; j++) {
|
for (j = 0; j < cell->ndistances; j++) {
|
||||||
virBufferAsprintf(buf, "<sibling id='%d' value='%d'/>\n",
|
virBufferAsprintf(buf, "<sibling id='%d' value='%d'/>\n",
|
||||||
cell->siblings[j].node,
|
cell->distances[j].node,
|
||||||
cell->siblings[j].distance);
|
cell->distances[j].distance);
|
||||||
}
|
}
|
||||||
virBufferAdjustIndent(buf, -2);
|
virBufferAdjustIndent(buf, -2);
|
||||||
virBufferAddLit(buf, "</distances>\n");
|
virBufferAddLit(buf, "</distances>\n");
|
||||||
@ -1456,11 +1456,11 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virCapabilitiesGetNUMASiblingInfo(int node,
|
virCapabilitiesGetNUMADistances(int node,
|
||||||
virCapsHostNUMACellSiblingInfo **siblings,
|
virCapsHostNUMACellDistance **distancesRet,
|
||||||
int *nsiblings)
|
int *ndistancesRet)
|
||||||
{
|
{
|
||||||
virCapsHostNUMACellSiblingInfo *tmp = NULL;
|
virCapsHostNUMACellDistance *tmp = NULL;
|
||||||
int tmp_size = 0;
|
int tmp_size = 0;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
int *distances = NULL;
|
int *distances = NULL;
|
||||||
@ -1471,12 +1471,12 @@ virCapabilitiesGetNUMASiblingInfo(int node,
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (!distances) {
|
if (!distances) {
|
||||||
*siblings = NULL;
|
*distancesRet = NULL;
|
||||||
*nsiblings = 0;
|
*ndistancesRet = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
tmp = g_new0(virCapsHostNUMACellSiblingInfo, ndistances);
|
tmp = g_new0(virCapsHostNUMACellDistance, ndistances);
|
||||||
|
|
||||||
for (i = 0; i < ndistances; i++) {
|
for (i = 0; i < ndistances; i++) {
|
||||||
if (!distances[i])
|
if (!distances[i])
|
||||||
@ -1489,8 +1489,8 @@ virCapabilitiesGetNUMASiblingInfo(int node,
|
|||||||
|
|
||||||
VIR_REALLOC_N(tmp, tmp_size);
|
VIR_REALLOC_N(tmp, tmp_size);
|
||||||
|
|
||||||
*nsiblings = tmp_size;
|
*ndistancesRet = tmp_size;
|
||||||
*siblings = g_steal_pointer(&tmp);
|
*distancesRet = g_steal_pointer(&tmp);
|
||||||
tmp_size = 0;
|
tmp_size = 0;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
cleanup:
|
cleanup:
|
||||||
@ -1607,8 +1607,8 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
|
|||||||
|
|
||||||
for (n = 0; n <= max_node; n++) {
|
for (n = 0; n <= max_node; n++) {
|
||||||
g_autoptr(virBitmap) cpumap = NULL;
|
g_autoptr(virBitmap) cpumap = NULL;
|
||||||
g_autofree virCapsHostNUMACellSiblingInfo *siblings = NULL;
|
g_autofree virCapsHostNUMACellDistance *distances = NULL;
|
||||||
int nsiblings = 0;
|
int ndistances = 0;
|
||||||
g_autofree virCapsHostNUMACellPageInfo *pageinfo = NULL;
|
g_autofree virCapsHostNUMACellPageInfo *pageinfo = NULL;
|
||||||
int npageinfo;
|
int npageinfo;
|
||||||
unsigned long long memory;
|
unsigned long long memory;
|
||||||
@ -1632,8 +1632,8 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virCapabilitiesGetNUMASiblingInfo(n, &siblings, &nsiblings) < 0)
|
if (virCapabilitiesGetNUMADistances(n, &distances, &ndistances) < 0)
|
||||||
goto cleanup;
|
return -1;
|
||||||
|
|
||||||
if (virCapabilitiesGetNUMAPagesInfo(n, &pageinfo, &npageinfo) < 0)
|
if (virCapabilitiesGetNUMAPagesInfo(n, &pageinfo, &npageinfo) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@ -1644,7 +1644,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps)
|
|||||||
|
|
||||||
virCapabilitiesHostNUMAAddCell(caps, n, memory,
|
virCapabilitiesHostNUMAAddCell(caps, n, memory,
|
||||||
ncpus, &cpus,
|
ncpus, &cpus,
|
||||||
nsiblings, &siblings,
|
ndistances, &distances,
|
||||||
npageinfo, &pageinfo);
|
npageinfo, &pageinfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ struct _virCapsHostNUMACellCPU {
|
|||||||
virBitmap *siblings;
|
virBitmap *siblings;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _virCapsHostNUMACellSiblingInfo {
|
struct _virCapsHostNUMACellDistance {
|
||||||
int node; /* foreign NUMA node */
|
int node; /* foreign NUMA node */
|
||||||
unsigned int distance; /* distance to the node */
|
unsigned int distance; /* distance to the node */
|
||||||
};
|
};
|
||||||
@ -109,8 +109,8 @@ struct _virCapsHostNUMACell {
|
|||||||
int ncpus;
|
int ncpus;
|
||||||
unsigned long long mem; /* in kibibytes */
|
unsigned long long mem; /* in kibibytes */
|
||||||
virCapsHostNUMACellCPU *cpus;
|
virCapsHostNUMACellCPU *cpus;
|
||||||
int nsiblings;
|
int ndistances;
|
||||||
virCapsHostNUMACellSiblingInfo *siblings;
|
virCapsHostNUMACellDistance *distances;
|
||||||
int npageinfo;
|
int npageinfo;
|
||||||
virCapsHostNUMACellPageInfo *pageinfo;
|
virCapsHostNUMACellPageInfo *pageinfo;
|
||||||
};
|
};
|
||||||
@ -255,8 +255,8 @@ virCapabilitiesHostNUMAAddCell(virCapsHostNUMA *caps,
|
|||||||
unsigned long long mem,
|
unsigned long long mem,
|
||||||
int ncpus,
|
int ncpus,
|
||||||
virCapsHostNUMACellCPU **cpus,
|
virCapsHostNUMACellCPU **cpus,
|
||||||
int nsiblings,
|
int ndistances,
|
||||||
virCapsHostNUMACellSiblingInfo **siblings,
|
virCapsHostNUMACellDistance **distances,
|
||||||
int npageinfo,
|
int npageinfo,
|
||||||
virCapsHostNUMACellPageInfo **pageinfo);
|
virCapsHostNUMACellPageInfo **pageinfo);
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ typedef struct _virCapsHostNUMACellCPU virCapsHostNUMACellCPU;
|
|||||||
|
|
||||||
typedef struct _virCapsHostNUMACellPageInfo virCapsHostNUMACellPageInfo;
|
typedef struct _virCapsHostNUMACellPageInfo virCapsHostNUMACellPageInfo;
|
||||||
|
|
||||||
typedef struct _virCapsHostNUMACellSiblingInfo virCapsHostNUMACellSiblingInfo;
|
typedef struct _virCapsHostNUMACellDistance virCapsHostNUMACellDistance;
|
||||||
|
|
||||||
typedef struct _virCapsHostSecModel virCapsHostSecModel;
|
typedef struct _virCapsHostSecModel virCapsHostSecModel;
|
||||||
|
|
||||||
|
@ -247,9 +247,9 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCaps *caps)
|
|||||||
{
|
{
|
||||||
libxl_numainfo *numa_info = NULL;
|
libxl_numainfo *numa_info = NULL;
|
||||||
libxl_cputopology *cpu_topo = NULL;
|
libxl_cputopology *cpu_topo = NULL;
|
||||||
int nr_nodes = 0, nr_cpus = 0, nr_siblings = 0;
|
int nr_nodes = 0, nr_cpus = 0, nr_distances = 0;
|
||||||
virCapsHostNUMACellCPU **cpus = NULL;
|
virCapsHostNUMACellCPU **cpus = NULL;
|
||||||
virCapsHostNUMACellSiblingInfo *siblings = NULL;
|
virCapsHostNUMACellDistance *distances = NULL;
|
||||||
int *nr_cpus_node = NULL;
|
int *nr_cpus_node = NULL;
|
||||||
size_t i;
|
size_t i;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -316,22 +316,22 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCaps *caps)
|
|||||||
if (numa_info[i].size == LIBXL_NUMAINFO_INVALID_ENTRY)
|
if (numa_info[i].size == LIBXL_NUMAINFO_INVALID_ENTRY)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
nr_siblings = numa_info[i].num_dists;
|
nr_distances = numa_info[i].num_dists;
|
||||||
if (nr_siblings) {
|
if (nr_distances) {
|
||||||
size_t j;
|
size_t j;
|
||||||
|
|
||||||
siblings = g_new0(virCapsHostNUMACellSiblingInfo, nr_siblings);
|
distances = g_new0(virCapsHostNUMACellDistance, nr_distances);
|
||||||
|
|
||||||
for (j = 0; j < nr_siblings; j++) {
|
for (j = 0; j < nr_distances; j++) {
|
||||||
siblings[j].node = j;
|
distances[j].node = j;
|
||||||
siblings[j].distance = numa_info[i].dists[j];
|
distances[j].distance = numa_info[i].dists[j];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
virCapabilitiesHostNUMAAddCell(caps->host.numa, i,
|
virCapabilitiesHostNUMAAddCell(caps->host.numa, i,
|
||||||
numa_info[i].size / 1024,
|
numa_info[i].size / 1024,
|
||||||
nr_cpus_node[i], &cpus[i],
|
nr_cpus_node[i], &cpus[i],
|
||||||
nr_siblings, &siblings,
|
nr_distances, &distances,
|
||||||
0, NULL);
|
0, NULL);
|
||||||
|
|
||||||
/* This is safe, as the CPU list is now stored in the NUMA cell */
|
/* This is safe, as the CPU list is now stored in the NUMA cell */
|
||||||
@ -348,7 +348,7 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCaps *caps)
|
|||||||
virCapabilitiesHostNUMAUnref(caps->host.numa);
|
virCapabilitiesHostNUMAUnref(caps->host.numa);
|
||||||
caps->host.numa = NULL;
|
caps->host.numa = NULL;
|
||||||
}
|
}
|
||||||
VIR_FREE(siblings);
|
VIR_FREE(distances);
|
||||||
}
|
}
|
||||||
|
|
||||||
VIR_FREE(cpus);
|
VIR_FREE(cpus);
|
||||||
|
Loading…
Reference in New Issue
Block a user