Re: [Qemu-devel] [PATCH v2 07/17] monitor: Add set_link arguments completion.

[Luiz Capitulino]

On Sun, 30 Mar 2014 11:58:29 +0100
Hani Benhabiles <address@hidden> wrote:

> Make it possible to query all net clients without specifying an ID when 
> calling
> qemu_find_net_clients_except().
> 
> This also adds the add_completion_option() function which is to be used for
> other commands completions as well.
> 
> Signed-off-by: Hani Benhabiles <address@hidden>
> ---
>  hmp-commands.hx |  1 +
>  hmp.h           |  1 +
>  monitor.c       | 34 ++++++++++++++++++++++++++++++++++
>  net/net.c       |  2 +-
>  4 files changed, 37 insertions(+), 1 deletion(-)
> 
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index 813c0fb..fbd303a 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1332,6 +1332,7 @@ ETEXI
>          .params     = "name on|off",
>          .help       = "change the link status of a network adapter",
>          .mhandler.cmd = hmp_set_link,
> +        .command_completion = set_link_completion,
>      },
>  
>  STEXI
> diff --git a/hmp.h b/hmp.h
> index 8701b16..33a883d 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -100,5 +100,6 @@ void device_del_completion(ReadLineState *rs, int 
> nb_args, const char *str);
>  void chardev_remove_completion(ReadLineState *rs, int nb_args, const char 
> *str);
>  void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str);
>  void cpu_completion(ReadLineState *rs, int nb_args, const char *str);
> +void set_link_completion(ReadLineState *rs, int nb_args, const char *str);
>  
>  #endif
> diff --git a/monitor.c b/monitor.c
> index 29d4f37..009f269 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4278,6 +4278,17 @@ static const char *next_arg_type(const char *typestr)
>      return (p != NULL ? ++p : typestr);
>  }
>  
> +static void add_completion_option(ReadLineState *rs, const char *str,
> +                                  const char *option)
> +{
> +    if (!str || !option) {
> +        return;
> +    }
> +    if (!strncmp(option, str, strlen(str))) {
> +        readline_add_completion(rs, option);
> +    }
> +}
> +
>  void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str)
>  {
>      size_t len;
> @@ -4453,6 +4464,29 @@ void cpu_completion(ReadLineState *rs, int nb_args, 
> const char *str)
>      qapi_free_CpuInfoList(start);
>  }
>  
> +void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
> +{
> +    size_t len;
> +
> +    len = strlen(str);
> +    readline_set_completion_index(rs, len);
> +    if (nb_args == 2) {
> +        NetClientState *ncs[255];
> +        int count, i;
> +        count = qemu_find_net_clients_except(NULL, ncs,
> +                                             NET_CLIENT_OPTIONS_KIND_NONE, 
> 255);
> +        for (i = 0; i < count; i++) {
> +            const char *name = ncs[i]->name;
> +            if (!strncmp(str, name, len)) {
> +                readline_add_completion(rs, name);
> +            }
> +        }
> +    } else if (nb_args == 3) {
> +        add_completion_option(rs, str, "on");
> +        add_completion_option(rs, str, "off");
> +    }
> +}
> +

This prints both, the backend and frontend. Shouldn't it print only one of
them?

>  static void monitor_find_completion_by_table(Monitor *mon,
>                                               const mon_cmd_t *cmd_table,
>                                               char **args,
> diff --git a/net/net.c b/net/net.c
> index e3ef1e4..86dd051 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -633,7 +633,7 @@ int qemu_find_net_clients_except(const char *id, 
> NetClientState **ncs,
>          if (nc->info->type == type) {
>              continue;
>          }
> -        if (!strcmp(nc->name, id)) {
> +        if (!id || !strcmp(nc->name, id)) {
>              if (ret < max) {
>                  ncs[ret] = nc;
>              }