[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V6 03/13] monitor: avoid use of global *cur_mon in b
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V6 03/13] monitor: avoid use of global *cur_mon in block_completion_it() |
Date: |
Thu, 11 Jul 2013 11:13:39 +0800 |
Signed-off-by: Wenchao Xia <address@hidden>
---
monitor.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 181d5b0..68f281e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4078,14 +4078,21 @@ static void file_completion(Monitor *mon, const char
*input)
closedir(ffs);
}
+typedef struct MonitorBlockComplete {
+ Monitor *mon;
+ const char *input;
+} MonitorBlockComplete;
+
static void block_completion_it(void *opaque, BlockDriverState *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' ||
!strncmp(name, (char *)input, strlen(input))) {
- readline_add_completion(cur_mon->rs, name);
+ readline_add_completion(mon->rs, name);
}
}
@@ -4129,6 +4136,7 @@ static void monitor_find_completion(const char *cmdline)
const char *ptype, *str;
const mon_cmd_t *cmd;
Monitor *mon = cur_mon;
+ MonitorBlockComplete mbs;
parse_cmdline(cmdline, &nb_args, args);
#ifdef DEBUG_COMPLETION
@@ -4187,8 +4195,10 @@ static void monitor_find_completion(const char *cmdline)
break;
case 'B':
/* block device name completion */
- readline_set_completion_index(cur_mon->rs, strlen(str));
- bdrv_iterate(block_completion_it, (void *)str);
+ mbs.mon = mon;
+ mbs.input = str;
+ readline_set_completion_index(mon->rs, strlen(str));
+ bdrv_iterate(block_completion_it, &mbs);
break;
case 's':
/* XXX: more generic ? */
--
1.7.1