From: David Hildenbrand <david@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, qemu-s390x@nongnu.org, Richard Henderson <rth@twiddle.net>, Paolo Bonzini <pbonzini@redhat.com>, "Dr . David Alan Gilbert" <dgilbert@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, "Michael S . Tsirkin" <mst@redhat.com>, David Hildenbrand <david@redhat.com> Subject: [PATCH v5 13/21] hmp: Handle virtio-mem when printing memory device info Date: Fri, 26 Jun 2020 09:22:40 +0200 [thread overview] Message-ID: <20200626072248.78761-14-david@redhat.com> (raw) In-Reply-To: <20200626072248.78761-1-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> --- 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(); } -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: David Hildenbrand <david@redhat.com> To: qemu-devel@nongnu.org Cc: Eduardo Habkost <ehabkost@redhat.com>, kvm@vger.kernel.org, "Michael S . Tsirkin" <mst@redhat.com>, David Hildenbrand <david@redhat.com>, "Dr . David Alan Gilbert" <dgilbert@redhat.com>, qemu-s390x@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <rth@twiddle.net> Subject: [PATCH v5 13/21] hmp: Handle virtio-mem when printing memory device info Date: Fri, 26 Jun 2020 09:22:40 +0200 [thread overview] Message-ID: <20200626072248.78761-14-david@redhat.com> (raw) In-Reply-To: <20200626072248.78761-1-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> --- 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(); } -- 2.26.2
next prev parent reply other threads:[~2020-06-26 7:24 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-26 7:22 [PATCH v5 00/21] virtio-mem: Paravirtualized memory hot(un)plug David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 01/21] pc: Support coldplugging of virtio-pmem-pci devices on all buses David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 02/21] exec: Introduce ram_block_discard_(disable|require)() David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 03/21] vfio: Convert to ram_block_discard_disable() David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 04/21] accel/kvm: " David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 05/21] s390x/pv: " David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 06/21] virtio-balloon: Rip out qemu_balloon_inhibit() David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 07/21] target/i386: sev: Use ram_block_discard_disable() David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 08/21] migration/rdma: " David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 09/21] migration/colo: " David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 10/21] virtio-mem: Paravirtualized memory hot(un)plug David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-30 10:06 ` Michael S. Tsirkin 2020-06-30 10:06 ` Michael S. Tsirkin 2020-06-30 10:21 ` David Hildenbrand 2020-06-30 10:21 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 11/21] virtio-pci: Proxy for virtio-mem David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-07-06 15:28 ` Cornelia Huck 2020-07-06 15:28 ` Cornelia Huck 2020-07-06 16:39 ` David Hildenbrand 2020-07-06 16:39 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 12/21] MAINTAINERS: Add myself as virtio-mem maintainer David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand [this message] 2020-06-26 7:22 ` [PATCH v5 13/21] hmp: Handle virtio-mem when printing memory device info David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 14/21] numa: Handle virtio-mem in NUMA stats David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 15/21] pc: Support for virtio-mem-pci David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 16/21] virtio-mem: Allow notifiers for size changes David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 17/21] virtio-pci: Send qapi events when the virtio-mem " David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 18/21] virtio-mem: Migration sanity checks David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 19/21] virtio-mem: Add trace events David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-07-02 19:08 ` Dr. David Alan Gilbert 2020-07-02 19:08 ` Dr. David Alan Gilbert 2020-06-26 7:22 ` [PATCH v5 20/21] virtio-mem: Exclude unplugged memory during migration David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-06-26 7:22 ` [PATCH v5 21/21] numa: Auto-enable NUMA when any memory devices are possible David Hildenbrand 2020-06-26 7:22 ` David Hildenbrand 2020-07-03 10:40 ` [PATCH v1] virtio-mem: fix cross-compilation due to VIRTIO_MEM_USABLE_EXTENT David Hildenbrand 2020-07-03 10:40 ` David Hildenbrand 2020-07-03 11:57 ` Michael S. Tsirkin 2020-07-03 11:57 ` Michael S. Tsirkin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200626072248.78761-14-david@redhat.com \ --to=david@redhat.com \ --cc=dgilbert@redhat.com \ --cc=ehabkost@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=rth@twiddle.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.