From: Pankaj Gupta <pagupta@redhat.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aarcange@redhat.com, cohuck@redhat.com, xiaoguangrong.eric@gmail.com, mst@redhat.com, pagupta@redhat.com, riel@surriel.com, david@redhat.com, armbru@redhat.com, ehabkost@redhat.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, dan.j.williams@intel.com, nilal@redhat.com, dgilbert@redhat.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH v2 5/7] hmp: Handle virtio-pmem when printing memory device infos Date: Wed, 19 Jun 2019 15:19:05 +0530 [thread overview] Message-ID: <20190619094907.10131-6-pagupta@redhat.com> (raw) In-Reply-To: <20190619094907.10131-1-pagupta@redhat.com> From: David Hildenbrand <david@redhat.com> Print the memory device info just like for PCDIMM/NVDIMM. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> --- hmp.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/hmp.c b/hmp.c index 92941142af..e1866bc7f1 100644 --- a/hmp.c +++ b/hmp.c @@ -2650,6 +2650,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; @@ -2659,19 +2660,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 : ""); @@ -2684,6 +2675,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.14.5
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Cc: Peter Maydell <peter.maydell@linaro.org>, "Dr . David Alan Gilbert" <dgilbert@redhat.com>, David Hildenbrand <david@redhat.com> Subject: [Qemu-devel] [PULL 09/22] hmp: Handle virtio-pmem when printing memory device infos Date: Tue, 2 Jul 2019 11:07:28 -0400 [thread overview] Message-ID: <20190619094907.10131-6-pagupta@redhat.com> (raw) Message-ID: <20190702150728.hqRETT4eHbz6SZw1VoRz2uqVRpk8kRZxHh9z1rKVVtg@z> (raw) In-Reply-To: <20190702150606.24851-1-mst@redhat.com> From: David Hildenbrand <david@redhat.com> Print the memory device info just like for PCDIMM/NVDIMM. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20190619094907.10131-6-pagupta@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- monitor/hmp-cmds.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index c283dde0e9..1c97926432 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -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(); } } } -- MST
next prev parent reply other threads:[~2019-06-19 9:55 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-19 9:49 [Qemu-devel] [PATCH v2 0/7] Qemu virtio pmem device Pankaj Gupta 2019-06-19 9:49 ` [Qemu-devel] [PATCH v2 1/7] virtio-pmem: add virtio device Pankaj Gupta 2019-07-02 11:46 ` Cornelia Huck 2019-07-02 15:07 ` [Qemu-devel] [PULL 05/22] " Michael S. Tsirkin 2019-07-11 12:57 ` Peter Maydell 2019-07-11 14:05 ` Pankaj Gupta 2019-06-19 9:49 ` [Qemu-devel] [PATCH v2 2/7] virtio-pci: Allow to specify additional interfaces for the base type Pankaj Gupta 2019-07-02 15:07 ` [Qemu-devel] [PULL 06/22] " Michael S. Tsirkin 2019-06-19 9:49 ` [Qemu-devel] [PATCH v2 3/7] virtio-pmem: sync linux headers Pankaj Gupta 2019-07-02 11:50 ` Cornelia Huck 2019-07-02 11:59 ` Pankaj Gupta 2019-07-02 16:58 ` Michael S. Tsirkin 2019-07-02 17:09 ` Pankaj Gupta 2019-07-02 17:11 ` Michael S. Tsirkin 2019-07-02 17:21 ` Pankaj Gupta 2019-07-02 15:10 ` Michael S. Tsirkin 2019-07-02 15:07 ` [Qemu-devel] [PULL 07/22] " Michael S. Tsirkin 2019-06-19 9:49 ` [Qemu-devel] [PATCH v2 4/7] virtio-pci: Proxy for virtio-pmem Pankaj Gupta 2019-07-02 11:55 ` Cornelia Huck 2019-07-02 12:00 ` Pankaj Gupta 2019-07-02 17:09 ` Michael S. Tsirkin 2019-07-02 17:14 ` Pankaj Gupta 2019-07-02 15:07 ` [Qemu-devel] [PULL 08/22] " Michael S. Tsirkin 2019-07-11 12:59 ` Peter Maydell 2019-07-11 13:27 ` Pankaj Gupta 2019-06-19 9:49 ` Pankaj Gupta [this message] 2019-07-02 8:50 ` [Qemu-devel] [PATCH v2 5/7] hmp: Handle virtio-pmem when printing memory device infos Wei Yang 2019-07-02 10:17 ` Pankaj Gupta 2019-07-02 15:07 ` [Qemu-devel] [PULL 09/22] " Michael S. Tsirkin 2019-06-19 9:49 ` [Qemu-devel] [PATCH v2 6/7] numa: Handle virtio-pmem in NUMA stats Pankaj Gupta 2019-07-02 15:07 ` [Qemu-devel] [PULL 10/22] " Michael S. Tsirkin 2019-06-19 9:49 ` [Qemu-devel] [PATCH v2 7/7] pc: Support for virtio-pmem-pci Pankaj Gupta 2019-07-02 15:07 ` [Qemu-devel] [PULL 11/22] " Michael S. Tsirkin 2019-07-01 3:53 ` [Qemu-devel] [PATCH v2 0/7] Qemu virtio pmem device Pankaj Gupta 2019-07-02 8:49 ` Wei Yang 2019-07-02 10:07 ` Pankaj Gupta 2019-07-03 0:58 ` Wei Yang 2019-07-03 1:31 ` Pankaj Gupta 2019-07-03 1:57 ` Wei Yang 2019-07-03 2:31 ` Pankaj Gupta 2019-07-03 2:42 ` Wei Yang 2019-07-03 3:21 ` Pankaj Gupta 2019-06-26 2:31 [Qemu-devel] [PATCH v4 0/5] virtio: fix some issues of "started" and "start_on_kick" flag elohimes 2019-06-26 2:31 ` [Qemu-devel] [PATCH v4 1/5] virtio: add "use-started" property elohimes 2019-06-26 10:17 ` Greg Kurz 2019-06-27 2:20 ` Yongji Xie 2019-07-02 15:07 ` [Qemu-devel] [PULL 13/22] " Michael S. Tsirkin 2019-06-26 2:31 ` [Qemu-devel] [PATCH v4 2/5] virtio: Set "start_on_kick" for legacy devices elohimes 2019-07-02 15:07 ` [Qemu-devel] [PULL 14/22] " Michael S. Tsirkin 2019-06-26 2:31 ` [Qemu-devel] [PATCH v4 3/5] virtio: Set "start_on_kick" on virtio_set_features() elohimes 2019-07-02 15:08 ` [Qemu-devel] [PULL 15/22] " Michael S. Tsirkin 2019-06-26 2:31 ` [Qemu-devel] [PATCH v4 4/5] virtio: Make sure we get correct state of device on handle_aio_output() elohimes 2019-07-02 15:08 ` [Qemu-devel] [PULL 16/22] " Michael S. Tsirkin 2019-06-26 2:31 ` [Qemu-devel] [PATCH v4 5/5] virtio: Don't change "started" flag on virtio_vmstate_change() elohimes 2019-07-02 15:08 ` [Qemu-devel] [PULL 17/22] " Michael S. Tsirkin 2019-06-26 10:43 ` [Qemu-devel] [PATCH v4 0/5] virtio: fix some issues of "started" and "start_on_kick" flag Laurent Vivier 2019-06-27 2:19 ` Yongji Xie 2019-06-26 7:48 [Qemu-devel] [PATCH v2 0/4] libvhost-user: VHOST_USER_PROTOCOL_F_MQ support Stefan Hajnoczi 2019-06-26 7:48 ` [Qemu-devel] [PATCH v2 1/4] libvhost-user: add vmsg_set_reply_u64() helper Stefan Hajnoczi 2019-07-02 15:08 ` [Qemu-devel] [PULL 19/22] " Michael S. Tsirkin 2019-06-26 7:48 ` [Qemu-devel] [PATCH v2 2/4] libvhost-user: support many virtqueues Stefan Hajnoczi 2019-07-02 15:08 ` [Qemu-devel] [PULL 20/22] " Michael S. Tsirkin 2019-06-26 7:48 ` [Qemu-devel] [PATCH v2 3/4] libvhost-user: implement VHOST_USER_PROTOCOL_F_MQ Stefan Hajnoczi 2019-07-02 15:08 ` [Qemu-devel] [PULL 21/22] " Michael S. Tsirkin 2019-06-26 7:48 ` [Qemu-devel] [PATCH v2 4/4] docs: avoid vhost-user-net specifics in multiqueue section Stefan Hajnoczi 2019-07-02 15:08 ` [Qemu-devel] [PULL 22/22] " Michael S. Tsirkin 2019-07-02 15:06 [Qemu-devel] [PULL 00/22] virtio, pc, pci: features, fixes, cleanups Michael S. Tsirkin 2019-06-25 23:23 ` [Qemu-devel] [PATCH] virtio-pci: fix missing device properties Marc-André Lureau 2019-06-26 1:55 ` Eduardo Habkost 2019-06-26 9:48 ` Marc-André Lureau 2019-06-26 12:39 ` Eduardo Habkost 2019-07-02 15:07 ` [Qemu-devel] [PULL 12/22] " Michael S. Tsirkin 2019-06-28 20:02 ` [Qemu-devel] [PATCH] pc: Move compat_apic_id_mode variable to PCMachineClass Eduardo Habkost 2019-06-29 10:46 ` Philippe Mathieu-Daudé 2019-06-30 21:30 ` Michael S. Tsirkin 2019-07-02 15:08 ` [Qemu-devel] [PULL 18/22] " Michael S. Tsirkin 2019-07-02 15:06 ` [Qemu-devel] [PULL 01/22] pcie: don't skip multi-mask events Michael S. Tsirkin 2019-07-02 15:06 ` [Qemu-devel] [PULL 02/22] pcie: check that slt ctrl changed before deleting Michael S. Tsirkin 2019-07-11 12:31 ` Peter Maydell 2019-07-02 15:06 ` [Qemu-devel] [PULL 03/22] pcie: work around for racy guest init Michael S. Tsirkin 2019-07-02 15:06 ` [Qemu-devel] [PULL 04/22] pcie: minor cleanups for slot control/status Michael S. Tsirkin 2019-07-02 15:56 ` [Qemu-devel] [PULL 00/22] virtio, pc, pci: features, fixes, cleanups Peter Maydell 2019-07-02 17:00 ` Michael S. Tsirkin 2019-07-02 17:20 ` Peter Maydell 2019-07-02 18:22 ` Michael S. Tsirkin 2019-07-02 18:27 ` Peter Maydell 2019-07-02 19:00 ` Michael S. Tsirkin 2019-07-26 12:39 ` Peter Maydell 2019-07-26 13:43 ` Michael S. Tsirkin 2019-07-04 9:25 ` Peter Maydell 2019-07-04 11:03 ` Pankaj Gupta 2019-07-04 21:24 ` Michael S. Tsirkin 2019-07-05 9:37 ` Pankaj Gupta 2019-07-04 21:29 ` Michael S. Tsirkin 2019-07-05 9:47 ` Peter Maydell
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=20190619094907.10131-6-pagupta@redhat.com \ --to=pagupta@redhat.com \ --cc=aarcange@redhat.com \ --cc=armbru@redhat.com \ --cc=cohuck@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=david@redhat.com \ --cc=dgilbert@redhat.com \ --cc=ehabkost@redhat.com \ --cc=imammedo@redhat.com \ --cc=kwolf@redhat.com \ --cc=lcapitulino@redhat.com \ --cc=mst@redhat.com \ --cc=nilal@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=riel@surriel.com \ --cc=rth@twiddle.net \ --cc=stefanha@redhat.com \ --cc=xiaoguangrong.eric@gmail.com \ /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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).