| Message ID | 1396177119-24955-4-git-send-email-kroosec@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Sun, 30 Mar 2014 11:58:25 +0100 Hani Benhabiles <kroosec@gmail.com> wrote: > Signed-off-by: Hani Benhabiles <hani@linux.com> This is not related to this change, but device_add seems to return non-hotpluggable devices in the completion list (eg. Opteron_G5-x86_64-cpu). Might be worth fixing in this series. One more comment below. > --- > hmp-commands.hx | 2 ++ > hmp.h | 2 ++ > monitor.c | 34 +++++++++++++++++++++------------- > 3 files changed, 25 insertions(+), 13 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 1b382b6..4c4d261 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -658,6 +658,7 @@ ETEXI > .help = "add device, like -device on the command line", > .user_print = monitor_user_noop, > .mhandler.cmd_new = do_device_add, > + .command_completion = device_add_completion, > }, > > STEXI > @@ -673,6 +674,7 @@ ETEXI > .params = "device", > .help = "remove device", > .mhandler.cmd = hmp_device_del, > + .command_completion = device_del_completion, > }, > > STEXI > diff --git a/hmp.h b/hmp.h > index 2f2c059..20ef454 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -95,5 +95,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict); > void hmp_object_del(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); > +void device_del_completion(ReadLineState *rs, int nb_args, const char *str); > > #endif > diff --git a/monitor.c b/monitor.c > index 566a83f..710ba25 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -4278,11 +4278,15 @@ static const char *next_arg_type(const char *typestr) > return (p != NULL ? ++p : typestr); > } > > -static void device_add_completion(ReadLineState *rs, const char *str) > +void device_add_completion(ReadLineState *rs, int nb_args, const char *str) > { > GSList *list, *elt; > size_t len; > > + if (nb_args != 2) { > + return; > + } > + > len = strlen(str); > readline_set_completion_index(rs, len); > list = elt = object_class_get_list(TYPE_DEVICE, false); > @@ -4323,8 +4327,8 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str) > g_slist_free(list); > } > > -static void device_del_completion(ReadLineState *rs, BusState *bus, > - const char *str, size_t len) > +static void device_del_bus_completion(ReadLineState *rs, BusState *bus, > + const char *str, size_t len) > { You don't have to respin just because of this, but it's not clear to me why you're renaming that function. > BusChild *kid; > > @@ -4337,11 +4341,24 @@ static void device_del_completion(ReadLineState *rs, BusState *bus, > } > > QLIST_FOREACH(dev_child, &dev->child_bus, sibling) { > - device_del_completion(rs, dev_child, str, len); > + device_del_bus_completion(rs, dev_child, str, len); > } > } > } > > +void device_del_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); > + device_del_bus_completion(rs, sysbus_get_default(), str, len); > +} > + > void object_del_completion(ReadLineState *rs, int nb_args, const char *str) > { > ObjectPropertyInfoList *list, *start; > @@ -4432,11 +4449,6 @@ 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") && nb_args == 2) { > - device_add_completion(mon->rs, str); > - } > - break; > case 's': > case 'S': > if (!strcmp(cmd->name, "sendkey")) { > @@ -4450,10 +4462,6 @@ static void monitor_find_completion_by_table(Monitor *mon, > } else if (!strcmp(cmd->name, "help|?")) { > monitor_find_completion_by_table(mon, cmd_table, > &args[1], nb_args - 1); > - } else if (!strcmp(cmd->name, "device_del") && nb_args == 2) { > - size_t len = strlen(str); > - readline_set_completion_index(mon->rs, len); > - device_del_completion(mon->rs, sysbus_get_default(), str, len); > } > break; > default:
diff --git a/hmp-commands.hx b/hmp-commands.hx index 1b382b6..4c4d261 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -658,6 +658,7 @@ ETEXI .help = "add device, like -device on the command line", .user_print = monitor_user_noop, .mhandler.cmd_new = do_device_add, + .command_completion = device_add_completion, }, STEXI @@ -673,6 +674,7 @@ ETEXI .params = "device", .help = "remove device", .mhandler.cmd = hmp_device_del, + .command_completion = device_del_completion, }, STEXI diff --git a/hmp.h b/hmp.h index 2f2c059..20ef454 100644 --- a/hmp.h +++ b/hmp.h @@ -95,5 +95,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict); void hmp_object_del(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); +void device_del_completion(ReadLineState *rs, int nb_args, const char *str); #endif diff --git a/monitor.c b/monitor.c index 566a83f..710ba25 100644 --- a/monitor.c +++ b/monitor.c @@ -4278,11 +4278,15 @@ static const char *next_arg_type(const char *typestr) return (p != NULL ? ++p : typestr); } -static void device_add_completion(ReadLineState *rs, const char *str) +void device_add_completion(ReadLineState *rs, int nb_args, const char *str) { GSList *list, *elt; size_t len; + if (nb_args != 2) { + return; + } + len = strlen(str); readline_set_completion_index(rs, len); list = elt = object_class_get_list(TYPE_DEVICE, false); @@ -4323,8 +4327,8 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str) g_slist_free(list); } -static void device_del_completion(ReadLineState *rs, BusState *bus, - const char *str, size_t len) +static void device_del_bus_completion(ReadLineState *rs, BusState *bus, + const char *str, size_t len) { BusChild *kid; @@ -4337,11 +4341,24 @@ static void device_del_completion(ReadLineState *rs, BusState *bus, } QLIST_FOREACH(dev_child, &dev->child_bus, sibling) { - device_del_completion(rs, dev_child, str, len); + device_del_bus_completion(rs, dev_child, str, len); } } } +void device_del_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); + device_del_bus_completion(rs, sysbus_get_default(), str, len); +} + void object_del_completion(ReadLineState *rs, int nb_args, const char *str) { ObjectPropertyInfoList *list, *start; @@ -4432,11 +4449,6 @@ 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") && nb_args == 2) { - device_add_completion(mon->rs, str); - } - break; case 's': case 'S': if (!strcmp(cmd->name, "sendkey")) { @@ -4450,10 +4462,6 @@ static void monitor_find_completion_by_table(Monitor *mon, } else if (!strcmp(cmd->name, "help|?")) { monitor_find_completion_by_table(mon, cmd_table, &args[1], nb_args - 1); - } else if (!strcmp(cmd->name, "device_del") && nb_args == 2) { - size_t len = strlen(str); - readline_set_completion_index(mon->rs, len); - device_del_completion(mon->rs, sysbus_get_default(), str, len); } break; default:
Signed-off-by: Hani Benhabiles <hani@linux.com> --- hmp-commands.hx | 2 ++ hmp.h | 2 ++ monitor.c | 34 +++++++++++++++++++++------------- 3 files changed, 25 insertions(+), 13 deletions(-)