From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUWn3-0006m4-N9 for qemu-devel@nongnu.org; Thu, 18 Sep 2014 04:10:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUWmz-00069y-3V for qemu-devel@nongnu.org; Thu, 18 Sep 2014 04:10:09 -0400 Received: from [59.151.112.132] (port=52800 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUWmy-000609-ET for qemu-devel@nongnu.org; Thu, 18 Sep 2014 04:10:05 -0400 Message-ID: <1411027772.16917.3.camel@G08FNSTD140041> From: zhugh Date: Thu, 18 Sep 2014 16:09:32 +0800 In-Reply-To: <1410780686-6298-1-git-send-email-zhugh.fnst@cn.fujitsu.com> References: <1410780686-6298-1-git-send-email-zhugh.fnst@cn.fujitsu.com> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4] Add HMP command "info memory-devices" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, hutao@cn.fujitsu.com, lcapitulino@redhat.com, isimatu.yasuaki@jp.fujitsu.com, hani@linux.com, stefanha@redhat.com, imammedo@redhat.com, tangchen@cn.fujitsu.com Hi, Could anyone help to review this patch? If there was no problem, could help to merge it? thanks! zhu On Mon, 2014-09-15 at 19:31 +0800, Zhu Guihua wrote: > Provides HMP equivalent of QMP query-memory-devices command. > > Signed-off-by: Zhu Guihua > --- > > Changes since v3: > - optimize the time to print memory devices' information. > - change output format of di->addr and di->size. > > Changes since v2: > - print address in hex. > - change the loop control from while to for. > - modify some variables' name. > - optimize the time to print memory devices' kind. > > Changes since v1: > - fix bug that accessing info->dimm when MemoryDeviceInfo is not PCDIMMDevice. > - use enum to replace "dimm", and lookup typename in MemoryDeviceInfoKind_lookup[] instead of opencodding it. > > hmp-commands.hx | 2 ++ > hmp.c | 38 ++++++++++++++++++++++++++++++++++++++ > hmp.h | 1 + > monitor.c | 7 +++++++ > 4 files changed, 48 insertions(+) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index f859f8d..0b1a4f7 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1778,6 +1778,8 @@ show qdev device model list > show roms > @item info tpm > show the TPM device > +@item info memory-devices > +show the memory devices > @end table > ETEXI > > diff --git a/hmp.c b/hmp.c > index 40a90da..feefeb4 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1718,3 +1718,41 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) > > qapi_free_MemdevList(memdev_list); > } > + > +void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) > +{ > + Error *err = NULL; > + MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err); > + MemoryDeviceInfoList *info; > + MemoryDeviceInfo *value; > + PCDIMMDeviceInfo *di; > + > + for (info = info_list; info; info = info->next) { > + value = info->value; > + > + if (value) { > + switch (value->kind) { > + case MEMORY_DEVICE_INFO_KIND_DIMM: > + di = value->dimm; > + > + monitor_printf(mon, "Memory device [%s]: %s\n", > + MemoryDeviceInfoKind_lookup[value->kind], > + di->id); > + monitor_printf(mon, " addr: 0x%" PRIx64 "\n", di->addr); > + monitor_printf(mon, " slot: %" PRId64 "\n", di->slot); > + monitor_printf(mon, " node: %" PRId64 "\n", di->node); > + monitor_printf(mon, " size: %" PRIu64 "\n", di->size); > + monitor_printf(mon, " memdev: %s\n", di->memdev); > + monitor_printf(mon, " hotplugged: %s\n", > + di->hotplugged ? "true" : "false"); > + monitor_printf(mon, " hotpluggable: %s\n", > + di->hotpluggable ? "true" : "false"); > + break; > + default: > + break; > + } > + } > + } > + > + qapi_free_MemoryDeviceInfoList(info_list); > +} > diff --git a/hmp.h b/hmp.h > index 4fd3c4a..4bb5dca 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict); > void hmp_object_add(Monitor *mon, const QDict *qdict); > void hmp_object_del(Monitor *mon, const QDict *qdict); > void hmp_info_memdev(Monitor *mon, const QDict *qdict); > +void hmp_info_memory_devices(Monitor *mon, const QDict *qdict); > void object_add_completion(ReadLineState *rs, int nb_args, const char *str); > void object_del_completion(ReadLineState *rs, int nb_args, const char *str); > void device_add_completion(ReadLineState *rs, int nb_args, const char *str); > diff --git a/monitor.c b/monitor.c > index 34cee74..fe88e0d 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2921,6 +2921,13 @@ static mon_cmd_t info_cmds[] = { > .mhandler.cmd = hmp_info_memdev, > }, > { > + .name = "memory-devices", > + .args_type = "", > + .params = "", > + .help = "show memory devices", > + .mhandler.cmd = hmp_info_memory_devices, > + }, > + { > .name = NULL, > }, > };