Skip to content

Commit

Permalink
monitor: avoid use of global *cur_mon in readline_completion()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Signed-off-by: Luiz Capitulino <[email protected]>
  • Loading branch information
Wenchao Xia authored and Luiz Capitulino committed Aug 30, 2013
1 parent d2674b2 commit d1a9756
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions readline.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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++) {
Expand Down

0 comments on commit d1a9756

Please sign in to comment.