openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hmp: rename arguments 

Rename 'string' to 'keys', rename 'hold_time' to 'hold-time'.

Signed-off-by: Amos Kong <akong@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Amos Kong 2012-08-31 10:56:22 +08:00 committed by Luiz Capitulino
parent cd383492bf
commit 2ef20c15b4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hmp-commands.hx
View File

@ -502,7 +502,7 @@ ETEXI
{ {
.name = "sendkey", .name = "sendkey",
.args_type = "string:s,hold_time:i?", .args_type = "keys:s,hold-time:i?",
.params = "keys [hold_ms]", .params = "keys [hold_ms]",
.help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)", .help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)",
.mhandler.cmd = do_sendkey, .mhandler.cmd = do_sendkey,

14
monitor.c
View File

@ -1480,9 +1480,9 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
char keyname_buf[16]; char keyname_buf[16];
char *separator; char *separator;
int keyname_len, keycode, i; int keyname_len, keycode, i;
const char *string = qdict_get_str(qdict, "string"); const char *keys = qdict_get_str(qdict, "keys");
int has_hold_time = qdict_haskey(qdict, "hold_time"); int has_hold_time = qdict_haskey(qdict, "hold-time");
int hold_time = qdict_get_try_int(qdict, "hold_time", -1); int hold_time = qdict_get_try_int(qdict, "hold-time", -1);
if (nb_pending_keycodes > 0) { if (nb_pending_keycodes > 0) {
qemu_del_timer(key_timer); qemu_del_timer(key_timer);
@ -1492,10 +1492,10 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
hold_time = 100; hold_time = 100;
i = 0; i = 0;
while (1) { while (1) {
separator = strchr(string, '-'); separator = strchr(keys, '-');
keyname_len = separator ? separator - string : strlen(string); keyname_len = separator ? separator - keys : strlen(keys);
if (keyname_len > 0) { 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) { if (keyname_len > sizeof(keyname_buf) - 1) {
monitor_printf(mon, "invalid key: '%s...'\n", keyname_buf); monitor_printf(mon, "invalid key: '%s...'\n", keyname_buf);
return; return;
@ -1521,7 +1521,7 @@ static void do_sendkey(Monitor *mon, const QDict *qdict)
} }
if (!separator) if (!separator)
break; break;
string = separator + 1; keys = separator + 1;
} }
nb_pending_keycodes = i; nb_pending_keycodes = i;
/* key down events */ /* key down events */