From patchwork Fri Sep 19 15:34:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 391342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5F0F5140186 for ; Sat, 20 Sep 2014 01:35:34 +1000 (EST) Received: from localhost ([::1]:59073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XV0Db-0000yM-Ab for incoming@patchwork.ozlabs.org; Fri, 19 Sep 2014 11:35:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XV0DF-0000fQ-55 for qemu-devel@nongnu.org; Fri, 19 Sep 2014 11:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XV0D9-0004A9-VF for qemu-devel@nongnu.org; Fri, 19 Sep 2014 11:35:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XV0D9-00040O-MV for qemu-devel@nongnu.org; Fri, 19 Sep 2014 11:35:03 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8JFYnt0013483 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 19 Sep 2014 11:34:50 -0400 Received: from localhost (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8JFYj4j016528; Fri, 19 Sep 2014 11:34:46 -0400 Date: Fri, 19 Sep 2014 11:34:44 -0400 From: Luiz Capitulino To: Igor Mammedov Message-ID: <20140919113444.02dc43ec@redhat.com> In-Reply-To: <20140919153019.4f62ed75@nial.usersys.redhat.com> References: <1410780686-6298-1-git-send-email-zhugh.fnst@cn.fujitsu.com> <1411027772.16917.3.camel@G08FNSTD140041> <20140919153019.4f62ed75@nial.usersys.redhat.com> Organization: Red Hat MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: zhugh , mst@redhat.com, hutao@cn.fujitsu.com, qemu-devel@nongnu.org, tangchen@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, hani@linux.com, stefanha@redhat.com Subject: Re: [Qemu-devel] [PATCH v4] Add HMP command "info memory-devices" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Fri, 19 Sep 2014 15:30:19 +0200 Igor Mammedov wrote: > On Thu, 18 Sep 2014 16:09:32 +0800 > zhugh wrote: > > > 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); > 'id' might be null, here is what user will see: > > Memory device [dimm]: (null) > > I'd suggest to replace (null) with "" as it is done elsewhere. Is the fix below what you're looking for? If it is I can apply it myself: > > With that fixed > Reviewed-By: Igor Mammedov > > > > + 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, > > > }, > > > }; > > > > > diff --git a/hmp.c b/hmp.c index feefeb4..14cb9f8 100644 --- a/hmp.c +++ b/hmp.c @@ -1737,7 +1737,7 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) monitor_printf(mon, "Memory device [%s]: %s\n", MemoryDeviceInfoKind_lookup[value->kind], - di->id); + di->id ? 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);