[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/16] monitor: Remove Monitor.cmd_table indirection
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 06/16] monitor: Remove Monitor.cmd_table indirection |
Date: |
Mon, 17 Jun 2019 20:48:53 +0200 |
From: Kevin Wolf <address@hidden>
Monitor.cmd_table is initialised to point to mon_cmds and never changed
afterwards. We can remove the indirection and just reference mon_cmds
directly instead.
Signed-off-by: Kevin Wolf <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index 7c57308e2a..6fb9fa285c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -193,7 +193,6 @@ struct Monitor {
bool use_io_thread;
gchar *mon_cpu_path;
- mon_cmd_t *cmd_table;
QTAILQ_ENTRY(Monitor) entry;
/*
@@ -722,8 +721,6 @@ static void monitor_data_init(Monitor *mon, int flags, bool
skip_flush,
}
qemu_mutex_init(&mon->mon_lock);
mon->outbuf = qstring_new();
- /* Use *mon_cmds by default. */
- mon->cmd_table = mon_cmds;
mon->skip_flush = skip_flush;
mon->use_io_thread = use_io_thread;
mon->flags = flags;
@@ -1024,7 +1021,7 @@ static void help_cmd(Monitor *mon, const char *name)
}
/* 2. dump the contents according to parsed args */
- help_cmd_dump(mon, mon->cmd_table, args, nb_args, 0);
+ help_cmd_dump(mon, mon_cmds, args, nb_args, 0);
free_cmdline_args(args, nb_args);
}
@@ -3485,7 +3482,7 @@ static void handle_hmp_command(MonitorHMP *mon, const
char *cmdline)
trace_handle_hmp_command(mon, cmdline);
- cmd = monitor_parse_command(mon, cmdline, &cmdline, mon->common.cmd_table);
+ cmd = monitor_parse_command(mon, cmdline, &cmdline, mon_cmds);
if (!cmd) {
return;
}
@@ -4132,7 +4129,7 @@ static void monitor_find_completion(void *opaque,
}
/* 2. auto complete according to args */
- monitor_find_completion_by_table(mon, mon->common.cmd_table, args,
nb_args);
+ monitor_find_completion_by_table(mon, mon_cmds, args, nb_args);
cleanup:
free_cmdline_args(args, nb_args);
--
2.21.0
- [Qemu-devel] [PULL 00/16] Monitor patches for 2019-06-17, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 03/16] monitor: Split monitor_init in HMP and QMP function, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 01/16] monitor: Fix return type of monitor_fdset_dup_fd_find, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 04/16] monitor: Make MonitorQMP a child class of Monitor, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 09/16] monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 08/16] Move monitor.c to monitor/misc.c, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 14/16] monitor: Split Monitor.flags into separate bools, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 06/16] monitor: Remove Monitor.cmd_table indirection,
Markus Armbruster <=
- [Qemu-devel] [PULL 02/16] monitor: Remove unused password prompting fields, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 11/16] monitor: Split out monitor/qmp.c, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 15/16] monitor: Replace monitor_init() with monitor_init_{hmp, qmp}(), Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 05/16] monitor: Create MonitorHMP with readline state, Markus Armbruster, 2019/06/17
- [Qemu-devel] [PULL 16/16] vl: Deprecate -mon pretty=... for HMP monitors, Markus Armbruster, 2019/06/17