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

hmp: Handle virtio-pmem when printing memory device infos 



Print the memory device info just like for PCDIMM/NVDIMM.

Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20190619094907.10131-6-pagupta@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent adf0748a

monitor/hmp-cmds.c

+15 −12
Original line number Diff line number Diff line
@@ -2653,6 +2653,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) 
    Error *err = NULL;

    MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err);

    MemoryDeviceInfoList *info;

    VirtioPMEMDeviceInfo *vpi;

    MemoryDeviceInfo *value;

    PCDIMMDeviceInfo *di;
@@ -2662,19 +2663,9 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) 
        if (value) {

            switch (value->type) {

            case MEMORY_DEVICE_INFO_KIND_DIMM:

                di = value->u.dimm.data;

                break;



            case MEMORY_DEVICE_INFO_KIND_NVDIMM:

                di = value->u.nvdimm.data;

                break;



            default:

                di = NULL;

                break;

            }



            if (di) {

                di = value->type == MEMORY_DEVICE_INFO_KIND_DIMM ?

                     value->u.dimm.data : value->u.nvdimm.data;

                monitor_printf(mon, "Memory device [%s]: \"%s\"\n",

                               MemoryDeviceInfoKind_str(value->type),

                               di->id ? di->id : "");
@@ -2687,6 +2678,18 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) 
                               di->hotplugged ? "true" : "false");

                monitor_printf(mon, "  hotpluggable: %s\n",

                               di->hotpluggable ? "true" : "false");

                break;

            case MEMORY_DEVICE_INFO_KIND_VIRTIO_PMEM:

                vpi = value->u.virtio_pmem.data;

                monitor_printf(mon, "Memory device [%s]: \"%s\"\n",

                               MemoryDeviceInfoKind_str(value->type),

                               vpi->id ? vpi->id : "");

                monitor_printf(mon, "  memaddr: 0x%" PRIx64 "\n", vpi->memaddr);

                monitor_printf(mon, "  size: %" PRIu64 "\n", vpi->size);

                monitor_printf(mon, "  memdev: %s\n", vpi->memdev);

                break;

            default:

                g_assert_not_reached();

            }

        }

    }