Commit 16647a82 authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin
Browse files

numa: Handle virtio-mem in NUMA stats 



Account the memory to the configured nid.

Reviewed-by: default avatarPankaj 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: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200626072248.78761-15-david@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 2e70874b

hw/core/numa.c

+6 −0
Original line number Diff line number Diff line
@@ -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();

            }