Re: [Qemu-devel] [PATCH v2 07/12] monitor: implement 'qmp_query_commands' without qmp_cmds

[Markus Armbruster]

address@hidden writes:

> From: Marc-André Lureau <address@hidden>
>
> So we can get rid of the static qmp_cmds table.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  monitor.c | 32 ++++++++++++++------------------
>  1 file changed, 14 insertions(+), 18 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 642be2e..bd41b4b 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -229,8 +229,6 @@ static int mon_refcount;
>  static mon_cmd_t mon_cmds[];
>  static mon_cmd_t info_cmds[];
>  
> -static const mon_cmd_t qmp_cmds[];
> -
>  Monitor *cur_mon;
>  
>  static QEMUClockType event_clock_type = QEMU_CLOCK_REALTIME;
> @@ -947,21 +945,24 @@ static void hmp_info_help(Monitor *mon, const QDict 
> *qdict)
>      help_cmd(mon, "info");
>  }
>  
> -CommandInfoList *qmp_query_commands(Error **errp)
> +static void query_commands_cb(QmpCommand *cmd, void *opaque)
>  {
> -    CommandInfoList *info, *cmd_list = NULL;
> -    const mon_cmd_t *cmd;
> +    CommandInfoList *info, **list = opaque;
>  
> -    for (cmd = qmp_cmds; cmd->name != NULL; cmd++) {
> -        info = g_malloc0(sizeof(*info));
> -        info->value = g_malloc0(sizeof(*info->value));
> -        info->value->name = g_strdup(cmd->name);
> +    info = g_malloc0(sizeof(*info));
> +    info->value = g_malloc0(sizeof(*info->value));
> +    info->value->name = g_strdup(cmd->name);
> +    info->next = *list;
> +    *list = info;
> +}
>  
> -        info->next = cmd_list;
> -        cmd_list = info;
> -    }
> +CommandInfoList *qmp_query_commands(Error **errp)
> +{
> +    CommandInfoList *list = NULL;
>  
> -    return cmd_list;
> +    qmp_for_each_command(query_commands_cb, &list);
> +
> +    return list;
>  }
>  
>  EventInfoList *qmp_query_events(Error **errp)
> @@ -2166,11 +2167,6 @@ static mon_cmd_t mon_cmds[] = {
>      { NULL, NULL, },
>  };
>  
> -static const mon_cmd_t qmp_cmds[] = {
> -#include "qmp-commands-old.h"
> -    { /* NULL */ },
> -};
> -
>  /*******************************************************************/
>  
>  static const char *pch;

I'm afraid you'll have to rearrange things a bit:

    x86_64-softmmu/monitor.o
/work/armbru/qemu/monitor.c: In function ‘qmp_find_cmd’:
/work/armbru/qemu/monitor.c:2522:34: error: ‘qmp_cmds’ undeclared (first use in 
this function)
     return search_dispatch_table(qmp_cmds, cmdname);
                                  ^
/work/armbru/qemu/monitor.c:2522:34: note: each undeclared identifier is 
reported only once for each function it appears in
/work/armbru/qemu/monitor.c:2523:1: warning: control reaches end of non-void 
function [-Wreturn-type]
 }
 ^