| Message ID | 20200610115419.51688-14-david@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio-mem: Paravirtualized memory hot(un)plug | expand |
* David Hildenbrand (david@redhat.com) wrote: > Print the memory device info just like for other memory devices. > > Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > monitor/hmp-cmds.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 9c61e769ca..afc9a28069 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -1818,6 +1818,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) > MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err); > MemoryDeviceInfoList *info; > VirtioPMEMDeviceInfo *vpi; > + VirtioMEMDeviceInfo *vmi; > MemoryDeviceInfo *value; > PCDIMMDeviceInfo *di; > > @@ -1852,6 +1853,21 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) > monitor_printf(mon, " size: %" PRIu64 "\n", vpi->size); > monitor_printf(mon, " memdev: %s\n", vpi->memdev); > break; > + case MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM: > + vmi = value->u.virtio_mem.data; > + monitor_printf(mon, "Memory device [%s]: \"%s\"\n", > + MemoryDeviceInfoKind_str(value->type), > + vmi->id ? vmi->id : ""); > + monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", vmi->memaddr); > + monitor_printf(mon, " node: %" PRId64 "\n", vmi->node); > + monitor_printf(mon, " requested-size: %" PRIu64 "\n", > + vmi->requested_size); > + monitor_printf(mon, " size: %" PRIu64 "\n", vmi->size); > + monitor_printf(mon, " max-size: %" PRIu64 "\n", vmi->max_size); > + monitor_printf(mon, " block-size: %" PRIu64 "\n", > + vmi->block_size); > + monitor_printf(mon, " memdev: %s\n", vmi->memdev); > + break; > default: > g_assert_not_reached(); > } > -- > 2.26.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
* David Hildenbrand (david@redhat.com) wrote: > Print the memory device info just like for other memory devices. > > Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > monitor/hmp-cmds.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 9c61e769ca..afc9a28069 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -1818,6 +1818,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) > MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err); > MemoryDeviceInfoList *info; > VirtioPMEMDeviceInfo *vpi; > + VirtioMEMDeviceInfo *vmi; > MemoryDeviceInfo *value; > PCDIMMDeviceInfo *di; > > @@ -1852,6 +1853,21 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) > monitor_printf(mon, " size: %" PRIu64 "\n", vpi->size); > monitor_printf(mon, " memdev: %s\n", vpi->memdev); > break; > + case MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM: > + vmi = value->u.virtio_mem.data; > + monitor_printf(mon, "Memory device [%s]: \"%s\"\n", > + MemoryDeviceInfoKind_str(value->type), > + vmi->id ? vmi->id : ""); > + monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", vmi->memaddr); > + monitor_printf(mon, " node: %" PRId64 "\n", vmi->node); > + monitor_printf(mon, " requested-size: %" PRIu64 "\n", > + vmi->requested_size); > + monitor_printf(mon, " size: %" PRIu64 "\n", vmi->size); > + monitor_printf(mon, " max-size: %" PRIu64 "\n", vmi->max_size); > + monitor_printf(mon, " block-size: %" PRIu64 "\n", > + vmi->block_size); > + monitor_printf(mon, " memdev: %s\n", vmi->memdev); > + break; > default: > g_assert_not_reached(); > } > -- > 2.26.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 9c61e769ca..afc9a28069 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1818,6 +1818,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err); MemoryDeviceInfoList *info; VirtioPMEMDeviceInfo *vpi; + VirtioMEMDeviceInfo *vmi; MemoryDeviceInfo *value; PCDIMMDeviceInfo *di; @@ -1852,6 +1853,21 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) monitor_printf(mon, " size: %" PRIu64 "\n", vpi->size); monitor_printf(mon, " memdev: %s\n", vpi->memdev); break; + case MEMORY_DEVICE_INFO_KIND_VIRTIO_MEM: + vmi = value->u.virtio_mem.data; + monitor_printf(mon, "Memory device [%s]: \"%s\"\n", + MemoryDeviceInfoKind_str(value->type), + vmi->id ? vmi->id : ""); + monitor_printf(mon, " memaddr: 0x%" PRIx64 "\n", vmi->memaddr); + monitor_printf(mon, " node: %" PRId64 "\n", vmi->node); + monitor_printf(mon, " requested-size: %" PRIu64 "\n", + vmi->requested_size); + monitor_printf(mon, " size: %" PRIu64 "\n", vmi->size); + monitor_printf(mon, " max-size: %" PRIu64 "\n", vmi->max_size); + monitor_printf(mon, " block-size: %" PRIu64 "\n", + vmi->block_size); + monitor_printf(mon, " memdev: %s\n", vmi->memdev); + break; default: g_assert_not_reached(); }
Print the memory device info just like for other memory devices. Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- monitor/hmp-cmds.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)