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

hmp: Handle virtio-mem when printing memory device info 



Print the memory device info just like for other memory devices.

Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200626072248.78761-14-david@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 751c7bdd

monitor/hmp-cmds.c

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

            }