Re: [Qemu-devel] [PATCH v2 08/17] monitor: Add netdev_add type argument completion.

[Luiz Capitulino]

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

> Also update the command's documentation.
> 
> Signed-off-by: Hani Benhabiles <address@hidden>
> ---
>  hmp-commands.hx |  3 ++-
>  hmp.h           |  1 +
>  monitor.c       | 18 ++++++++++++++++++
>  3 files changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index fbd303a..b009561 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1226,9 +1226,10 @@ ETEXI
>      {
>          .name       = "netdev_add",
>          .args_type  = "netdev:O",
> -        .params     = 
> "[user|tap|socket|hubport|netmap],id=str[,prop=value][,...]",
> +        .params     = 
> "[user|tap|socket|vde|bridge|hubport|netmap],id=str[,prop=value][,...]",
>          .help       = "add host network device",
>          .mhandler.cmd = hmp_netdev_add,
> +        .command_completion = netdev_add_completion,
>      },
>  
>  STEXI
> diff --git a/hmp.h b/hmp.h
> index 33a883d..9dab1a3 100644
> --- a/hmp.h
> +++ b/hmp.h
> @@ -101,5 +101,6 @@ 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);
> +void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str);
>  
>  #endif
> diff --git a/monitor.c b/monitor.c
> index 009f269..5293370 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4312,6 +4312,24 @@ void chardev_add_completion(ReadLineState *rs, int 
> nb_args, const char *str)
>      qapi_free_ChardevBackendInfoList(start);
>  }
>  
> +void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
> +{
> +    size_t len;
> +
> +    if (nb_args != 2) {
> +        return;
> +    }
> +    len = strlen(str);
> +    readline_set_completion_index(rs, len);
> +    add_completion_option(rs, str, "user");
> +    add_completion_option(rs, str, "tap");
> +    add_completion_option(rs, str, "socket");
> +    add_completion_option(rs, str, "vde");
> +    add_completion_option(rs, str, "bridge");
> +    add_completion_option(rs, str, "hubport");
> +    add_completion_option(rs, str, "netmap");

Having hardcoded values doesn't look good to me at all. I think we need
a way to query those, and then we add completion.

> +}
> +
>  void device_add_completion(ReadLineState *rs, int nb_args, const char *str)
>  {
>      GSList *list, *elt;