[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 05/15] monitor: Remove Monitor.cmd_table indirect
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v3 05/15] monitor: Remove Monitor.cmd_table indirection |
Date: |
Thu, 13 Jun 2019 17:33:55 +0200 |
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>
---
monitor.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index 572449f6db..5eacaa48a6 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;
@@ -1026,7 +1023,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);
}
@@ -3487,7 +3484,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;
}
@@ -4134,7 +4131,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.20.1
- [Qemu-block] [PATCH v3 00/15] monitor: Split monitor.c in core/HMP/QMP/misc, Kevin Wolf, 2019/06/13
- [Qemu-block] [PATCH v3 01/15] monitor: Remove unused password prompting fields, Kevin Wolf, 2019/06/13
- [Qemu-block] [PATCH v3 03/15] monitor: Make MonitorQMP a child class of Monitor, Kevin Wolf, 2019/06/13
- [Qemu-block] [PATCH v3 02/15] monitor: Split monitor_init in HMP and QMP function, Kevin Wolf, 2019/06/13
- [Qemu-block] [PATCH v3 05/15] monitor: Remove Monitor.cmd_table indirection,
Kevin Wolf <=
- [Qemu-block] [PATCH v3 06/15] monitor: Rename HMP command type and tables, Kevin Wolf, 2019/06/13
- [Qemu-block] [PATCH v3 07/15] Move monitor.c to monitor/misc.c, Kevin Wolf, 2019/06/13
- [Qemu-block] [PATCH v3 09/15] monitor: Create monitor-internal.h with common definitions, Kevin Wolf, 2019/06/13