mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: avoid use of global *cur_mon in block_completion_it()

Browse Source 
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>
This commit is contained in:
Wenchao Xia 2013-08-27 20:38:15 +08:00 committed by Luiz Capitulino
parent cb8f68b104
commit 599a926abc
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
monitor.c
View File

@ -4091,14 +4091,21 @@ static void file_completion(Monitor *mon, const char *input)
closedir(ffs); closedir(ffs);
} }
typedef struct MonitorBlockComplete {
Monitor *mon;
const char *input;
} MonitorBlockComplete;
static void block_completion_it(void *opaque, BlockDriverState *bs) static void block_completion_it(void *opaque, BlockDriverState *bs)
{ {
const char *name = bdrv_get_device_name(bs); const char *name = bdrv_get_device_name(bs);
const char *input = opaque; MonitorBlockComplete *mbc = opaque;
Monitor *mon = mbc->mon;
const char *input = mbc->input;
if (input[0] == '\0' || if (input[0] == '\0' ||
!strncmp(name, (char *)input, strlen(input))) { !strncmp(name, (char *)input, strlen(input))) {
readline_add_completion(cur_mon->rs, name); readline_add_completion(mon->rs, name);
} }
} }
@ -4142,6 +4149,7 @@ static void monitor_find_completion(const char *cmdline)
const char *ptype, *str; const char *ptype, *str;
const mon_cmd_t *cmd; const mon_cmd_t *cmd;
Monitor *mon = cur_mon; Monitor *mon = cur_mon;
MonitorBlockComplete mbs;
parse_cmdline(cmdline, &nb_args, args); parse_cmdline(cmdline, &nb_args, args);
#ifdef DEBUG_COMPLETION #ifdef DEBUG_COMPLETION
@ -4200,8 +4208,10 @@ static void monitor_find_completion(const char *cmdline)
break; break;
case 'B': case 'B':
/* block device name completion */ /* block device name completion */
readline_set_completion_index(cur_mon->rs, strlen(str)); mbs.mon = mon;
bdrv_iterate(block_completion_it, (void *)str); mbs.input = str;
readline_set_completion_index(mon->rs, strlen(str));
bdrv_iterate(block_completion_it, &mbs);
break; break;
case 's': case 's':
/* XXX: more generic ? */ /* XXX: more generic ? */