diff mbox

monitor: Add device_add type argument completion.

Message ID 1390602475-19621-1-git-send-email-kroosec@gmail.com
State New
Headers show

Commit Message

Hani Benhabiles Jan. 24, 2014, 10:27 p.m. UTC 
Signed-off-by: Hani Benhabiles <kroosec@gmail.com>
---
 monitor.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

Comments

Luiz Capitulino Feb. 10, 2014, 7:49 p.m. UTC | #1 
On Fri, 24 Jan 2014 23:27:55 +0100
Hani Benhabiles <kroosec@gmail.com> wrote:

> Signed-off-by: Hani Benhabiles <kroosec@gmail.com>
> ---
>  monitor.c | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
> 
> diff --git a/monitor.c b/monitor.c
> index 845f608..cf91544 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4254,6 +4254,26 @@ static const char *next_arg_type(const char *typestr)
>      return (p != NULL ? ++p : typestr);
>  }
>  
> +static void device_add_completion(ReadLineState *rs, const char *str)
> +{
> +    GSList *list, *elt;
> +    size_t len;
> +    len = strlen(str);
> +    readline_set_completion_index(rs, len);
> +    list = elt = object_class_get_list(TYPE_DEVICE, false);
> +    while (elt) {
> +        const char *name;
> +        DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
> +                                             TYPE_DEVICE);
> +        name = object_class_get_name(OBJECT_CLASS(dc));
> +        if (!strncmp(name, str, len)) {
> +            readline_add_completion(rs, name);
> +        }
> +        elt = elt->next;
> +    }
> +    g_slist_free(list);
> +}
> +
>  static void monitor_find_completion_by_table(Monitor *mon,
>                                               const mon_cmd_t *cmd_table,
>                                               char **args,
> @@ -4317,6 +4337,11 @@ static void monitor_find_completion_by_table(Monitor *mon,
>              readline_set_completion_index(mon->rs, strlen(str));
>              bdrv_iterate(block_completion_it, &mbs);
>              break;
> +        case 'O':
> +            if (!strcmp(cmd->name, "device_add")) {
> +                device_add_completion(mon->rs, str);

This is nice, but it keeps printing auto-completion options even after
it has auto-completed. For example:

(qemu) device_add pcnet <TAB>

Will show all device names once again.

> +            }
> +            break;
>          case 's':
>          case 'S':
>              if (!strcmp(cmd->name, "sendkey")) {
Hani Benhabiles Feb. 10, 2014, 9:23 p.m. UTC | #2 
Hi Luiz,

Thanks for taking a look at it.

On Mon, Feb 10, 2014 at 02:49:13PM -0500, Luiz Capitulino wrote:
> On Fri, 24 Jan 2014 23:27:55 +0100
> Hani Benhabiles <kroosec@gmail.com> wrote:
> 
> > Signed-off-by: Hani Benhabiles <kroosec@gmail.com>
> > ---
> >  monitor.c | 25 +++++++++++++++++++++++++
> >  1 file changed, 25 insertions(+)
> > 
> > diff --git a/monitor.c b/monitor.c
> > index 845f608..cf91544 100644
> > --- a/monitor.c
> > +++ b/monitor.c
> > @@ -4254,6 +4254,26 @@ static const char *next_arg_type(const char *typestr)
> >      return (p != NULL ? ++p : typestr);
> >  }
> >  
> > +static void device_add_completion(ReadLineState *rs, const char *str)
> > +{
> > +    GSList *list, *elt;
> > +    size_t len;
> > +    len = strlen(str);
> > +    readline_set_completion_index(rs, len);
> > +    list = elt = object_class_get_list(TYPE_DEVICE, false);
> > +    while (elt) {
> > +        const char *name;
> > +        DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
> > +                                             TYPE_DEVICE);
> > +        name = object_class_get_name(OBJECT_CLASS(dc));
> > +        if (!strncmp(name, str, len)) {
> > +            readline_add_completion(rs, name);
> > +        }
> > +        elt = elt->next;
> > +    }
> > +    g_slist_free(list);
> > +}
> > +
> >  static void monitor_find_completion_by_table(Monitor *mon,
> >                                               const mon_cmd_t *cmd_table,
> >                                               char **args,
> > @@ -4317,6 +4337,11 @@ static void monitor_find_completion_by_table(Monitor *mon,
> >              readline_set_completion_index(mon->rs, strlen(str));
> >              bdrv_iterate(block_completion_it, &mbs);
> >              break;
> > +        case 'O':
> > +            if (!strcmp(cmd->name, "device_add")) {
> > +                device_add_completion(mon->rs, str);
> 
> This is nice, but it keeps printing auto-completion options even after
> it has auto-completed. For example:
> 
> (qemu) device_add pcnet <TAB>
> 
> Will show all device names once again.
> 
> > +            }
> > +            break;
> >          case 's':
> >          case 'S':
> >              if (!strcmp(cmd->name, "sendkey")) {
> 

I fixed the issue in these patch series:
http://lists.gnu.org/archive/html/qemu-devel/2014-02/msg00891.html

Could you please take a look at it ?

Cheers,

Hani.
Luiz Capitulino Feb. 10, 2014, 9:26 p.m. UTC | #3 
On Mon, 10 Feb 2014 22:23:02 +0100
Hani Benhabiles <kroosec@gmail.com> wrote:

> Hi Luiz,
> 
> Thanks for taking a look at it.
> 
> On Mon, Feb 10, 2014 at 02:49:13PM -0500, Luiz Capitulino wrote:
> > On Fri, 24 Jan 2014 23:27:55 +0100
> > Hani Benhabiles <kroosec@gmail.com> wrote:
> > 
> > > Signed-off-by: Hani Benhabiles <kroosec@gmail.com>
> > > ---
> > >  monitor.c | 25 +++++++++++++++++++++++++
> > >  1 file changed, 25 insertions(+)
> > > 
> > > diff --git a/monitor.c b/monitor.c
> > > index 845f608..cf91544 100644
> > > --- a/monitor.c
> > > +++ b/monitor.c
> > > @@ -4254,6 +4254,26 @@ static const char *next_arg_type(const char *typestr)
> > >      return (p != NULL ? ++p : typestr);
> > >  }
> > >  
> > > +static void device_add_completion(ReadLineState *rs, const char *str)
> > > +{
> > > +    GSList *list, *elt;
> > > +    size_t len;
> > > +    len = strlen(str);
> > > +    readline_set_completion_index(rs, len);
> > > +    list = elt = object_class_get_list(TYPE_DEVICE, false);
> > > +    while (elt) {
> > > +        const char *name;
> > > +        DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
> > > +                                             TYPE_DEVICE);
> > > +        name = object_class_get_name(OBJECT_CLASS(dc));
> > > +        if (!strncmp(name, str, len)) {
> > > +            readline_add_completion(rs, name);
> > > +        }
> > > +        elt = elt->next;
> > > +    }
> > > +    g_slist_free(list);
> > > +}
> > > +
> > >  static void monitor_find_completion_by_table(Monitor *mon,
> > >                                               const mon_cmd_t *cmd_table,
> > >                                               char **args,
> > > @@ -4317,6 +4337,11 @@ static void monitor_find_completion_by_table(Monitor *mon,
> > >              readline_set_completion_index(mon->rs, strlen(str));
> > >              bdrv_iterate(block_completion_it, &mbs);
> > >              break;
> > > +        case 'O':
> > > +            if (!strcmp(cmd->name, "device_add")) {
> > > +                device_add_completion(mon->rs, str);
> > 
> > This is nice, but it keeps printing auto-completion options even after
> > it has auto-completed. For example:
> > 
> > (qemu) device_add pcnet <TAB>
> > 
> > Will show all device names once again.
> > 
> > > +            }
> > > +            break;
> > >          case 's':
> > >          case 'S':
> > >              if (!strcmp(cmd->name, "sendkey")) {
> > 
> 
> I fixed the issue in these patch series:
> http://lists.gnu.org/archive/html/qemu-devel/2014-02/msg00891.html
> 
> Could you please take a look at it ?

It's in my queue, I should get to it. Eventually :)
diff mbox

Patch

diff --git a/monitor.c b/monitor.c
index 845f608..cf91544 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4254,6 +4254,26 @@  static const char *next_arg_type(const char *typestr)
     return (p != NULL ? ++p : typestr);
 }
 
+static void device_add_completion(ReadLineState *rs, const char *str)
+{
+    GSList *list, *elt;
+    size_t len;
+    len = strlen(str);
+    readline_set_completion_index(rs, len);
+    list = elt = object_class_get_list(TYPE_DEVICE, false);
+    while (elt) {
+        const char *name;
+        DeviceClass *dc = OBJECT_CLASS_CHECK(DeviceClass, elt->data,
+                                             TYPE_DEVICE);
+        name = object_class_get_name(OBJECT_CLASS(dc));
+        if (!strncmp(name, str, len)) {
+            readline_add_completion(rs, name);
+        }
+        elt = elt->next;
+    }
+    g_slist_free(list);
+}
+
 static void monitor_find_completion_by_table(Monitor *mon,
                                              const mon_cmd_t *cmd_table,
                                              char **args,
@@ -4317,6 +4337,11 @@  static void monitor_find_completion_by_table(Monitor *mon,
             readline_set_completion_index(mon->rs, strlen(str));
             bdrv_iterate(block_completion_it, &mbs);
             break;
+        case 'O':
+            if (!strcmp(cmd->name, "device_add")) {
+                device_add_completion(mon->rs, str);
+            }
+            break;
         case 's':
         case 'S':
             if (!strcmp(cmd->name, "sendkey")) {