[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/20] numa: handle virtio-pmem in NUMA stats
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v2 18/20] numa: handle virtio-pmem in NUMA stats |
Date: |
Wed, 29 Aug 2018 17:36:22 +0200 |
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 <address@hidden>
---
numa.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/numa.c b/numa.c
index 81542d4ebb..8aa9b21a22 100644
--- a/numa.c
+++ b/numa.c
@@ -544,30 +544,31 @@ static void numa_stat_memory_devices(NumaNodeMem
node_mem[])
{
MemoryDeviceInfoList *info_list = qmp_memory_device_list();
MemoryDeviceInfoList *info;
- PCDIMMDeviceInfo *pcdimm_info;
+ VirtioPMemDeviceInfo *vpi;
for (info = info_list; info; info = info->next) {
MemoryDeviceInfo *value = info->value;
+ PCDIMMDeviceInfo *pcdimm_info = NULL;
if (value) {
switch (value->type) {
case MEMORY_DEVICE_INFO_KIND_DIMM:
pcdimm_info = value->u.dimm.data;
- break;
-
case MEMORY_DEVICE_INFO_KIND_NVDIMM:
- pcdimm_info = value->u.nvdimm.data;
- break;
-
- default:
- pcdimm_info = NULL;
- break;
- }
-
- if (pcdimm_info) {
+ if (!pcdimm_info) {
+ pcdimm_info = value->u.nvdimm.data;
+ }
node_mem[pcdimm_info->node].node_mem += pcdimm_info->size;
node_mem[pcdimm_info->node].node_plugged_mem +=
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;
+ default:
+ break;
}
}
}
--
2.17.1
- [Qemu-devel] [PATCH v2 08/20] pc-dimm: implement memory device class function set_addr(), (continued)
- [Qemu-devel] [PATCH v2 08/20] pc-dimm: implement memory device class function set_addr(), David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 09/20] memory-device: complete factoring out pre_plug handling, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 10/20] memory-device: complete factoring out plug handling, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 11/20] memory-device: complete factoring out unplug handling, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 12/20] memory-device: trace when pre_assigning/assigning/unassigning addresses, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 13/20] hw/acpi-build: only indicate nvdimm and pc-dimm, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 15/20] virtio-pmem: prototype, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 17/20] hmp: handle virtio-pmem when printing memory device infos, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 16/20] virtio-pci: proxy for virtio-pmem, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 18/20] numa: handle virtio-pmem in NUMA stats,
David Hildenbrand <=
- [Qemu-devel] [PATCH v2 19/20] virtio-pmem: hotplug support functions, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 20/20] pc: support for virtio-pmem, David Hildenbrand, 2018/08/29