Commit 29136cd8 authored by Hani Benhabiles's avatar Hani Benhabiles Committed by Luiz Capitulino
Browse files

monitor: Convert sendkey to use command_completion. 



Signed-off-by: default avatarHani Benhabiles <hani@linux.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 87a560c4

hmp-commands.hx

+1 −0
Original line number Diff line number Diff line
@@ -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

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -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

monitor.c

+23 −9
Original line number Diff line number Diff line
@@ -4376,6 +4376,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,
@@ -4444,15 +4466,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);

            }