diff options
| author | Wenchao Xia <xiawenc@linux.vnet.ibm.com> | 2013-08-27 20:38:17 +0800 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2013-08-30 07:41:14 -0400 |
| commit | d1a9756ab8c2c2578cbcb325efffe0b0af916944 (patch) | |
| tree | 81944798d762a0cc0b91d50b90570ca888fcf4d4 /readline.c | |
| parent | d2674b2cf7db7dce865f3c2b89f0e36d1657a3b5 (diff) | |
monitor: avoid use of global *cur_mon in readline_completion()
Now all completion functions do not use *cur_mon any more, instead
they use rs->mon. In short, structure ReadLineState decide where
the complete action would be taken now.
Tested with the case that qemu have two telnet monitors, auto
completion function works normal.
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'readline.c')
| -rw-r--r-- | readline.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/readline.c b/readline.c index c91b324cb1..abf27ddec3 100644 --- a/readline.c +++ b/readline.c @@ -276,7 +276,6 @@ void readline_set_completion_index(ReadLineState *rs, int index) static void readline_completion(ReadLineState *rs) { - Monitor *mon = cur_mon; int len, i, j, max_width, nb_cols, max_prefix; char *cmdline; @@ -300,7 +299,7 @@ static void readline_completion(ReadLineState *rs) if (len > 0 && rs->completions[0][len - 1] != '/') readline_insert_char(rs, ' '); } else { - monitor_printf(mon, "\n"); + monitor_printf(rs->mon, "\n"); max_width = 0; max_prefix = 0; for(i = 0; i < rs->nb_completions; i++) { |