[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 16/41] hmp: Handle virtio-mem when printing memory device info
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 16/41] hmp: Handle virtio-mem when printing memory device info |
Date: |
Sat, 4 Jul 2020 14:30:05 -0400 |
From: David Hildenbrand <david@redhat.com>
Print the memory device info just like for other memory devices.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200626072248.78761-14-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@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 2b0b58a336..2ec13e4cc3 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -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();
}
--
MST
- [PULL v2 06/41] vfio: Convert to ram_block_discard_disable(), (continued)
- [PULL v2 06/41] vfio: Convert to ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 01/41] tests: disassemble-aml.sh: generate AML in readable format, Michael S. Tsirkin, 2020/07/04
- [PULL v2 10/41] target/i386: sev: Use ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 08/41] s390x/pv: Convert to ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 09/41] virtio-balloon: Rip out qemu_balloon_inhibit(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 11/41] migration/rdma: Use ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 12/41] migration/colo: Use ram_block_discard_disable(), Michael S. Tsirkin, 2020/07/04
- [PULL v2 13/41] virtio-mem: Paravirtualized memory hot(un)plug, Michael S. Tsirkin, 2020/07/04
- [PULL v2 14/41] virtio-pci: Proxy for virtio-mem, Michael S. Tsirkin, 2020/07/04
- [PULL v2 15/41] MAINTAINERS: Add myself as virtio-mem maintainer, Michael S. Tsirkin, 2020/07/04
- [PULL v2 16/41] hmp: Handle virtio-mem when printing memory device info,
Michael S. Tsirkin <=
- [PULL v2 17/41] numa: Handle virtio-mem in NUMA stats, Michael S. Tsirkin, 2020/07/04
- [PULL v2 18/41] pc: Support for virtio-mem-pci, Michael S. Tsirkin, 2020/07/04
- [PULL v2 19/41] virtio-mem: Allow notifiers for size changes, Michael S. Tsirkin, 2020/07/04
- [PULL v2 20/41] virtio-pci: Send qapi events when the virtio-mem size changes, Michael S. Tsirkin, 2020/07/04
- [PULL v2 22/41] virtio-mem: Add trace events, Michael S. Tsirkin, 2020/07/04
- [PULL v2 23/41] virtio-mem: Exclude unplugged memory during migration, Michael S. Tsirkin, 2020/07/04
- [PULL v2 24/41] numa: Auto-enable NUMA when any memory devices are possible, Michael S. Tsirkin, 2020/07/04
- [PULL v2 25/41] tests/acpi: remove stale allowed tables, Michael S. Tsirkin, 2020/07/04
- [PULL v2 27/41] MAINTAINERS: add VT-d entry, Michael S. Tsirkin, 2020/07/04
- [PULL v2 26/41] docs: vhost-user: add Virtio status protocol feature, Michael S. Tsirkin, 2020/07/04