[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 07/10] hmp: Handle virtio-pmem when printing mem
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH RFC 07/10] hmp: Handle virtio-pmem when printing memory device infos |
Date: |
Wed, 16 Jan 2019 12:35:20 +0100 |
Print the memory device info just like for PCDIMM/NVDIMM.
Signed-off-by: David Hildenbrand <address@hidden>
---
hmp.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/hmp.c b/hmp.c
index 8da5fd8760..25c32e0810 100644
--- a/hmp.c
+++ b/hmp.c
@@ -2553,6 +2553,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;
@@ -2562,19 +2563,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 : "");
@@ -2587,6 +2578,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();
}
}
}
--
2.17.2
- Re: [Qemu-devel] [PATCH RFC 01/10] qdev: Let the hotplug_handler_unplug() caller delete the device, (continued)
[Qemu-devel] [PATCH RFC 05/10] virtio-pci: Allow to specify additional interfaces for the base type, David Hildenbrand, 2019/01/16
[Qemu-devel] [PATCH RFC 02/10] qdev: Let machine hotplug handler to override bus hotplug handler, David Hildenbrand, 2019/01/16
[Qemu-devel] [PATCH RFC 03/10] qdev: Provide qdev_get_bus_hotplug_handler(), David Hildenbrand, 2019/01/16
[Qemu-devel] [PATCH RFC 10/10] pc: Enable support for virtio-pmem, David Hildenbrand, 2019/01/16
[Qemu-devel] [PATCH RFC 07/10] hmp: Handle virtio-pmem when printing memory device infos,
David Hildenbrand <=
[Qemu-devel] [PATCH RFC 06/10] virtio-pci: Proxy for virtio-pmem, David Hildenbrand, 2019/01/16
[Qemu-devel] [PATCH RFC 08/10] numa: Handle virtio-pmem in NUMA stats, David Hildenbrand, 2019/01/16
[Qemu-devel] [PATCH RFC 04/10] virtio-pmem: Prototype, David Hildenbrand, 2019/01/16
- Re: [Qemu-devel] [PATCH RFC 04/10] virtio-pmem: Prototype, Eric Blake, 2019/01/16
- Re: [Qemu-devel] [PATCH RFC 04/10] virtio-pmem: Prototype, David Hildenbrand, 2019/01/17
- Re: [Qemu-devel] [PATCH RFC 04/10] virtio-pmem: Prototype, David Hildenbrand, 2019/01/21
- Re: [Qemu-devel] [PATCH RFC 04/10] virtio-pmem: Prototype, Dr. David Alan Gilbert, 2019/01/21
- Re: [Qemu-devel] [PATCH RFC 04/10] virtio-pmem: Prototype, David Hildenbrand, 2019/01/21
- Re: [Qemu-devel] [PATCH RFC 04/10] virtio-pmem: Prototype, Eric Blake, 2019/01/21
Re: [Qemu-devel] [Qemu-ppc] [PATCH RFC 04/10] virtio-pmem: Prototype, Murilo Opsfelder Araujo, 2019/01/16