diff options
| author | Amos Kong <akong@redhat.com> | 2012-08-31 10:56:22 +0800 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2012-09-05 15:48:56 -0300 |
| commit | 2ef20c15b4736c9b0afc7ef2b14239182fbcd3e1 (patch) | |
| tree | fd35d49496693b43279f46523e0551528d67dd9a | |
| parent | cd383492bfb5ea805d518e129d7a5402c7b99ef2 (diff) | |
| download | focaccia-qemu-2ef20c15b4736c9b0afc7ef2b14239182fbcd3e1.tar.gz focaccia-qemu-2ef20c15b4736c9b0afc7ef2b14239182fbcd3e1.zip | |
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>
| -rw-r--r-- | hmp-commands.hx | 2 | ||||
| -rw-r--r-- | monitor.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index 6a70a9c598..bd0c6c9191 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 c97c120062..84176eb8f6 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 */ |