[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/19] hmp: rename arguments
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 04/19] hmp: rename arguments |
Date: |
Wed, 5 Sep 2012 15:58:31 -0300 |
From: Amos Kong <address@hidden>
Rename 'string' to 'keys', rename 'hold_time' to 'hold-time'.
Signed-off-by: Amos Kong <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
hmp-commands.hx | 2 +-
monitor.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 6a70a9c..bd0c6c9 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -502,7 +502,7 @@ ETEXI
{
.name = "sendkey",
- .args_type = "string:s,hold_time:i?",
+ .args_type = "keys:s,hold-time:i?",
.params = "keys [hold_ms]",
.help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1',
default hold time=100 ms)",
.mhandler.cmd = do_sendkey,
diff --git a/monitor.c b/monitor.c
index c97c120..84176eb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1480,9 +1480,9 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
char keyname_buf[16];
char *separator;
int keyname_len, keycode, i;
- const char *string = qdict_get_str(qdict, "string");
- int has_hold_time = qdict_haskey(qdict, "hold_time");
- int hold_time = qdict_get_try_int(qdict, "hold_time", -1);
+ const char *keys = qdict_get_str(qdict, "keys");
+ int has_hold_time = qdict_haskey(qdict, "hold-time");
+ int hold_time = qdict_get_try_int(qdict, "hold-time", -1);
if (nb_pending_keycodes > 0) {
qemu_del_timer(key_timer);
@@ -1492,10 +1492,10 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
hold_time = 100;
i = 0;
while (1) {
- separator = strchr(string, '-');
- keyname_len = separator ? separator - string : strlen(string);
+ separator = strchr(keys, '-');
+ keyname_len = separator ? separator - keys : strlen(keys);
if (keyname_len > 0) {
- pstrcpy(keyname_buf, sizeof(keyname_buf), string);
+ pstrcpy(keyname_buf, sizeof(keyname_buf), keys);
if (keyname_len > sizeof(keyname_buf) - 1) {
monitor_printf(mon, "invalid key: '%s...'\n", keyname_buf);
return;
@@ -1521,7 +1521,7 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
}
if (!separator)
break;
- string = separator + 1;
+ keys = separator + 1;
}
nb_pending_keycodes = i;
/* key down events */
--
1.7.11.2.249.g31c7954.dirty
- [Qemu-devel] [PULL 00/19]: QMP queue, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 01/19] Add support for pretty-printing response in qmp-shell, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 02/19] fix doc of using raw values with sendkey, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 03/19] monitor: rename keyname '<' to 'less', Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 04/19] hmp: rename arguments,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 05/19] qapi: generate list struct and visit_list for enum, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 06/19] qapi: add the QKeyCode enum, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 07/19] monitor: move key_defs[] table and introduce two help functions, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 10/19] json-parser: Fix potential NULL pointer segfault, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 08/19] qapi: convert sendkey, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 09/19] qapi: Fix potential NULL pointer segfault, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 11/19] error: add error_setg(), Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 14/19] vga: ppm_save(): add error handling, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 13/19] qapi: convert screendump, Luiz Capitulino, 2012/09/05
- [Qemu-devel] [PATCH 15/19] omap_lcdc: rename ppm_save() to omap_ppm_save(), Luiz Capitulino, 2012/09/05