numa: Handle virtio-pmem in NUMA stats
Account the memory to node 0 for now. Once (if ever) virtio-pmem supports NUMA, we can account it to the right node. Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20190619094907.10131-7-pagupta@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
d766b22bbd
commit
cae02c3480
24
numa.c
24
numa.c
|
@ -549,6 +549,7 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])
|
||||||
MemoryDeviceInfoList *info_list = qmp_memory_device_list();
|
MemoryDeviceInfoList *info_list = qmp_memory_device_list();
|
||||||
MemoryDeviceInfoList *info;
|
MemoryDeviceInfoList *info;
|
||||||
PCDIMMDeviceInfo *pcdimm_info;
|
PCDIMMDeviceInfo *pcdimm_info;
|
||||||
|
VirtioPMEMDeviceInfo *vpi;
|
||||||
|
|
||||||
for (info = info_list; info; info = info->next) {
|
for (info = info_list; info; info = info->next) {
|
||||||
MemoryDeviceInfo *value = info->value;
|
MemoryDeviceInfo *value = info->value;
|
||||||
|
@ -556,22 +557,21 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])
|
||||||
if (value) {
|
if (value) {
|
||||||
switch (value->type) {
|
switch (value->type) {
|
||||||
case MEMORY_DEVICE_INFO_KIND_DIMM:
|
case MEMORY_DEVICE_INFO_KIND_DIMM:
|
||||||
pcdimm_info = value->u.dimm.data;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case MEMORY_DEVICE_INFO_KIND_NVDIMM:
|
case MEMORY_DEVICE_INFO_KIND_NVDIMM:
|
||||||
pcdimm_info = value->u.nvdimm.data;
|
pcdimm_info = value->type == MEMORY_DEVICE_INFO_KIND_DIMM ?
|
||||||
break;
|
value->u.dimm.data : value->u.nvdimm.data;
|
||||||
|
|
||||||
default:
|
|
||||||
pcdimm_info = NULL;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pcdimm_info) {
|
|
||||||
node_mem[pcdimm_info->node].node_mem += pcdimm_info->size;
|
node_mem[pcdimm_info->node].node_mem += pcdimm_info->size;
|
||||||
node_mem[pcdimm_info->node].node_plugged_mem +=
|
node_mem[pcdimm_info->node].node_plugged_mem +=
|
||||||
pcdimm_info->size;
|
pcdimm_info->size;
|
||||||
|
break;
|
||||||
|
case MEMORY_DEVICE_INFO_KIND_VIRTIO_PMEM:
|
||||||
|
vpi = value->u.virtio_pmem.data;
|
||||||
|
/* TODO: once we support numa, assign to right node */
|
||||||
|
node_mem[0].node_mem += vpi->size;
|
||||||
|
node_mem[0].node_plugged_mem += vpi->size;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
g_assert_not_reached();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue