Message ID | 20200603144914.41645-15-david@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | virtio-mem: Paravirtualized memory hot(un)plug | expand |
> Account the memory to the configured nid. > > 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> > --- > hw/core/numa.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/hw/core/numa.c b/hw/core/numa.c > index 316bc50d75..06960918e7 100644 > --- a/hw/core/numa.c > +++ b/hw/core/numa.c > @@ -812,6 +812,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; > @@ -832,6 +833,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(); > } Reviewed-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
diff --git a/hw/core/numa.c b/hw/core/numa.c index 316bc50d75..06960918e7 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -812,6 +812,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; @@ -832,6 +833,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(); }
Account the memory to the configured nid. 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> --- hw/core/numa.c | 6 ++++++ 1 file changed, 6 insertions(+)