[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 05/10] monitor: Move cmd_table to MonitorHMP
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [RFC PATCH 05/10] monitor: Move cmd_table to MonitorHMP |
Date: |
Fri, 7 Jun 2019 15:54:25 +0200 |
Monitor.cmd_table contains the handlers for HMP commands, so there is no
reason to keep it in the state shared with QMP. Move it to MonitorHMP.
Signed-off-by: Kevin Wolf <address@hidden>
---
monitor.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/monitor.c b/monitor.c
index 810f3dcf9c..d964dd1969 100644
--- a/monitor.c
+++ b/monitor.c
@@ -191,7 +191,6 @@ struct Monitor {
bool use_io_thread;
gchar *mon_cpu_path;
- mon_cmd_t *cmd_table;
QTAILQ_ENTRY(Monitor) entry;
/*
@@ -219,6 +218,7 @@ struct MonitorHMP {
* These members can be safely accessed without locks.
*/
ReadLineState *rs;
+ mon_cmd_t *cmd_table;
};
typedef struct {
@@ -720,13 +720,19 @@ static void monitor_data_init(Monitor *mon, int flags,
bool skip_flush,
memset(mon, 0, sizeof(Monitor));
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;
}
+static void monitor_data_init_hmp(MonitorHMP *mon, int flags, bool skip_flush)
+{
+ monitor_data_init(&mon->common, flags, skip_flush, false);
+
+ /* Use *mon_cmds by default. */
+ mon->cmd_table = mon_cmds;
+}
+
static void monitor_data_destroy_qmp(MonitorQMP *mon)
{
json_message_parser_destroy(&mon->parser);
@@ -757,7 +763,7 @@ char *qmp_human_monitor_command(const char *command_line,
bool has_cpu_index,
Monitor *old_mon;
MonitorHMP hmp = {};
- monitor_data_init(&hmp.common, 0, true, false);
+ monitor_data_init_hmp(&hmp, 0, true);
old_mon = cur_mon;
cur_mon = &hmp.common;
@@ -1002,6 +1008,7 @@ static void help_cmd_dump(Monitor *mon, const mon_cmd_t
*cmds,
static void help_cmd(Monitor *mon, const char *name)
{
+ MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
char *args[MAX_ARGS];
int nb_args = 0;
@@ -1024,7 +1031,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, hmp_mon->cmd_table, args, nb_args, 0);
free_cmdline_args(args, nb_args);
}
@@ -3477,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->cmd_table);
if (!cmd) {
return;
}
@@ -4124,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->cmd_table, args, nb_args);
cleanup:
free_cmdline_args(args, nb_args);
@@ -4680,7 +4687,7 @@ static void monitor_init_hmp(Chardev *chr, int flags)
MonitorHMP *mon = g_malloc0(sizeof(*mon));
bool use_readline = flags & MONITOR_USE_READLINE;
- monitor_data_init(&mon->common, flags, false, false);
+ monitor_data_init_hmp(mon, flags, false);
qemu_chr_fe_init(&mon->common.chr, chr, &error_abort);
if (use_readline) {
--
2.20.1
- [Qemu-block] [RFC PATCH 00/10] monitor: Split monitor.c in core/HMP/QMP/misc, Kevin Wolf, 2019/06/07
- [Qemu-block] [RFC PATCH 01/10] monitor: Remove unused password prompting fields, Kevin Wolf, 2019/06/07
- [Qemu-block] [RFC PATCH 05/10] monitor: Move cmd_table to MonitorHMP,
Kevin Wolf <=
- [Qemu-block] [RFC PATCH 02/10] monitor: Split monitor_init in HMP and QMP function, Kevin Wolf, 2019/06/07
- [Qemu-block] [RFC PATCH 04/10] monitor: Create MonitorHMP with readline state, Kevin Wolf, 2019/06/07
- [Qemu-block] [RFC PATCH 06/10] Move monitor.c to monitor/misc.c, Kevin Wolf, 2019/06/07
- [Qemu-block] [RFC PATCH 07/10] monitor: Create monitor_int.h with common definitions, Kevin Wolf, 2019/06/07
- [Qemu-block] [RFC PATCH 08/10] monitor: Split out monitor/qmp.c, Kevin Wolf, 2019/06/07