[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] monitor: Convert sendkey to use command_complet
From: |
Hani Benhabiles |
Subject: |
[Qemu-devel] [PATCH 1/6] monitor: Convert sendkey to use command_completion. |
Date: |
Wed, 7 May 2014 23:41:27 +0100 |
Signed-off-by: Hani Benhabiles <address@hidden>
---
hmp-commands.hx | 1 +
hmp.h | 1 +
monitor.c | 32 +++++++++++++++++++++++---------
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 8971f1b..b4b23c8 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -556,6 +556,7 @@ ETEXI
.params = "keys [hold_ms]",
.help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1',
default hold time=100 ms)",
.mhandler.cmd = hmp_send_key,
+ .command_completion = sendkey_completion,
},
STEXI
diff --git a/hmp.h b/hmp.h
index 20ef454..12e21e7 100644
--- a/hmp.h
+++ b/hmp.h
@@ -97,5 +97,6 @@ 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);
+void sendkey_completion(ReadLineState *rs, int nb_args, const char *str);
#endif
diff --git a/monitor.c b/monitor.c
index 2d3fb3f..7ef251c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4359,6 +4359,28 @@ void object_del_completion(ReadLineState *rs, int
nb_args, const char *str)
qapi_free_ObjectPropertyInfoList(start);
}
+void sendkey_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ int i;
+ char *sep;
+ size_t len;
+
+ if (nb_args != 2) {
+ return;
+ }
+ sep = strrchr(str, '-');
+ if (sep) {
+ str = sep + 1;
+ }
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ for (i = 0; i < Q_KEY_CODE_MAX; i++) {
+ if (!strncmp(str, QKeyCode_lookup[i], len)) {
+ readline_add_completion(rs, QKeyCode_lookup[i]);
+ }
+ }
+}
+
static void monitor_find_completion_by_table(Monitor *mon,
const mon_cmd_t *cmd_table,
char **args,
@@ -4427,15 +4449,7 @@ static void monitor_find_completion_by_table(Monitor
*mon,
break;
case 's':
case 'S':
- if (!strcmp(cmd->name, "sendkey")) {
- char *sep = strrchr(str, '-');
- if (sep)
- str = sep + 1;
- readline_set_completion_index(mon->rs, strlen(str));
- for (i = 0; i < Q_KEY_CODE_MAX; i++) {
- cmd_completion(mon, str, QKeyCode_lookup[i]);
- }
- } else if (!strcmp(cmd->name, "help|?")) {
+ if (!strcmp(cmd->name, "help|?")) {
monitor_find_completion_by_table(mon, cmd_table,
&args[1], nb_args - 1);
}
--
1.8.3.2
- [Qemu-devel] [PATCH 0/6] Miscellaneous command completion patches, Hani Benhabiles, 2014/05/07
- [Qemu-devel] [PATCH 1/6] monitor: Convert sendkey to use command_completion.,
Hani Benhabiles <=
- [Qemu-devel] [PATCH 2/6] monitor: Add chardev-remove command completion., Hani Benhabiles, 2014/05/07
- [Qemu-devel] [PATCH 4/6] monitor: Add set_link arguments completion., Hani Benhabiles, 2014/05/07
- [Qemu-devel] [PATCH 3/6] monitor: Add chardev-add backend argument completion., Hani Benhabiles, 2014/05/07
- [Qemu-devel] [PATCH 5/6] monitor: Add netdev_add type argument completion., Hani Benhabiles, 2014/05/07
- [Qemu-devel] [PATCH 6/6] monitor: Add netdev_del id argument completion., Hani Benhabiles, 2014/05/07
- Re: [Qemu-devel] [PATCH 0/6] Miscellaneous command completion patches, Gerd Hoffmann, 2014/05/08
- Re: [Qemu-devel] [PATCH 0/6] Miscellaneous command completion patches, Luiz Capitulino, 2014/05/15
- Re: [Qemu-devel] [PATCH 0/6] Miscellaneous command completion patches, Hani Benhabiles, 2014/05/15