[v4] Add HMP command "info memory-devices"
diff mbox

Message ID 20140919113444.02dc43ec@redhat.com
State New
Headers show

Commit Message

Luiz Capitulino Sept. 19, 2014, 3:34 p.m. UTC
On Fri, 19 Sep 2014 15:30:19 +0200
Igor Mammedov <imammedo@redhat.com> wrote:

> On Thu, 18 Sep 2014 16:09:32 +0800
> zhugh <zhugh.fnst@cn.fujitsu.com> 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 <zhugh.fnst@cn.fujitsu.com>
> > > ---
> > > 
> > > 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 <imammedo@redhat.com>
> 
> > > +                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,
> > >      },
> > >  };
> > 
> > 
>

Comments

Zhu Guihua Sept. 20, 2014, 4:51 a.m. UTC | #1
On Fri, 2014-09-19 at 11:34 -0400, Luiz Capitulino wrote:
> On Fri, 19 Sep 2014 15:30:19 +0200
> Igor Mammedov <imammedo@redhat.com> wrote:
> 
> > On Thu, 18 Sep 2014 16:09:32 +0800
> > zhugh <zhugh.fnst@cn.fujitsu.com> 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 <zhugh.fnst@cn.fujitsu.com>
> > > > ---
> > > > 
> > > > 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:

Yes, I think the fix is what Igor expects. So could you apply the fix?
If not, I can send patch v5 to fix the problem.

> 
> 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);
> > 
> > With that fixed
> > Reviewed-By: Igor Mammedov <imammedo@redhat.com>
> > 
> > > > +                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,
> > > >      },
> > > >  };
> > > 
> > > 
> > 
>

Patch
diff mbox

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);