[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/41] numa: Handle virtio-mem in NUMA stats
From: |
Michael S. Tsirkin |
Subject: |
[PULL 17/41] numa: Handle virtio-mem in NUMA stats |
Date: |
Fri, 3 Jul 2020 05:04:15 -0400 |
From: David Hildenbrand <david@redhat.com>
Account the memory to the configured nid.
Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200626072248.78761-15-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/core/numa.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/core/numa.c b/hw/core/numa.c
index 2725886d06..e9aec69afd 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -824,6 +824,7 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[])
MemoryDeviceInfoList *info;
PCDIMMDeviceInfo *pcdimm_info;
VirtioPMEMDeviceInfo *vpi;
+ VirtioMEMDeviceInfo *vmi;
for (info = info_list; info; info = info->next) {
MemoryDeviceInfo *value = info->value;
@@ -844,6 +845,11 @@ static void numa_stat_memory_devices(NumaNodeMem
node_mem[])
node_mem[0].node_mem += vpi->size;
node_mem[0].node_plugged_mem += vpi->size;
break;
+ case MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM:
+ vmi = value->u.virtio_mem.data;
+ node_mem[vmi->node].node_mem += vmi->size;
+ node_mem[vmi->node].node_plugged_mem += vmi->size;
+ break;
default:
g_assert_not_reached();
}
--
MST
- [PULL 10/41] target/i386: sev: Use ram_block_discard_disable(), (continued)
- [PULL 14/41] virtio-pci: Proxy for virtio-mem, Michael S. Tsirkin, 2020/07/03
- [PULL 16/41] hmp: Handle virtio-mem when printing memory device info, Michael S. Tsirkin, 2020/07/03
- [PULL 15/41] MAINTAINERS: Add myself as virtio-mem maintainer, Michael S. Tsirkin, 2020/07/03
- [PULL 17/41] numa: Handle virtio-mem in NUMA stats,
Michael S. Tsirkin <=
- [PULL 18/41] pc: Support for virtio-mem-pci, Michael S. Tsirkin, 2020/07/03
- [PULL 20/41] virtio-pci: Send qapi events when the virtio-mem size changes, Michael S. Tsirkin, 2020/07/03
- [PULL 21/41] virtio-mem: Migration sanity checks, Michael S. Tsirkin, 2020/07/03
- [PULL 22/41] virtio-mem: Add trace events, Michael S. Tsirkin, 2020/07/03
- [PULL 23/41] virtio-mem: Exclude unplugged memory during migration, Michael S. Tsirkin, 2020/07/03
- [PULL 25/41] tests/acpi: remove stale allowed tables, Michael S. Tsirkin, 2020/07/03
- [PULL 26/41] docs: vhost-user: add Virtio status protocol feature, Michael S. Tsirkin, 2020/07/03
- [PULL 24/41] numa: Auto-enable NUMA when any memory devices are possible, Michael S. Tsirkin, 2020/07/03
- [PULL 27/41] MAINTAINERS: add VT-d entry, Michael S. Tsirkin, 2020/07/03
- [PULL 28/41] net: introduce qemu_get_peer, Michael S. Tsirkin, 2020/07/03