From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnBT7-00011S-DV for qemu-devel@nongnu.org; Wed, 21 May 2014 14:42:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnBT2-0006xm-9J for qemu-devel@nongnu.org; Wed, 21 May 2014 14:42:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnBT2-0006xd-0L for qemu-devel@nongnu.org; Wed, 21 May 2014 14:42:20 -0400 Date: Wed, 21 May 2014 19:42:12 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20140521184211.GH2589@work-vm> References: <1400540600-1328-1-git-send-email-kroosec@gmail.com> <1400540600-1328-4-git-send-email-kroosec@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1400540600-1328-4-git-send-email-kroosec@gmail.com> Subject: Re: [Qemu-devel] [PATCH 3/7] monitor: Add migrate_set_capability completion. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hani Benhabiles Cc: kwolf@redhat.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, stefanha@redhat.com, imammedo@redhat.com * Hani Benhabiles (kroosec@gmail.com) wrote: > Signed-off-by: Hani Benhabiles > --- > hmp-commands.hx | 1 + > hmp.h | 2 ++ > monitor.c | 21 +++++++++++++++++++++ > 3 files changed, 24 insertions(+) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 45e1763..919af6e 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -975,6 +975,7 @@ ETEXI > .params = "capability state", > .help = "Enable/Disable the usage of a capability for migration", > .mhandler.cmd = hmp_migrate_set_capability, > + .command_completion = migrate_set_capability_completion, > }, > > STEXI > diff --git a/hmp.h b/hmp.h > index a70804d..0c814d0 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -107,5 +107,7 @@ void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *str); > void ringbuf_read_completion(ReadLineState *rs, int nb_args, const char *str); > void watchdog_action_completion(ReadLineState *rs, int nb_args, > const char *str); > +void migrate_set_capability_completion(ReadLineState *rs, int nb_args, > + const char *str); Thank you for doing this; I spend way too much time typing these commands. > #endif > diff --git a/monitor.c b/monitor.c > index fb300c2..6a3a5c9 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -4572,6 +4572,27 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str) > add_completion_option(rs, str, "none"); > } > > +void migrate_set_capability_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) { > + int i; > + for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) { > + const char *name = MigrationCapability_lookup[i]; > + 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"); > + } It's a shame you have to do all of these manually; if we could tell something that we had an enum of 'MigrationCapability' then it could remove the command specific glue. Dave > +} > + > static void monitor_find_completion_by_table(Monitor *mon, > const mon_cmd_t *cmd_table, > char **args, > -- > 1.8.3.2 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK