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

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: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20190619094907.10131-7-pagupta@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent d766b22b

numa.c

+12 −12
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ 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;
@@ -556,22 +557,21 @@ static void numa_stat_memory_devices(NumaNodeMem node_mem[]) 
        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) {

                pcdimm_info = value->type == MEMORY_DEVICE_INFO_KIND_DIMM ?

                              value->u.dimm.data : 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;

                break;

            default:

                g_assert_not_reached();

            }

        }

    }