vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h 

The next commit will move a caller of help_cmd() to a new file.
Including monitor/monitor-internal.h there just for help_cmd() feels
silly.  Better to provide it in monitor/hmp.h suitably renamed.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-8-armbru@redhat.com>
master
Markus Armbruster 2023-01-24 13:19:21 +01:00
parent 52f50b1e9f
commit 5ec92f2d92
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/monitor/hmp.h
View File

@ -18,6 +18,7 @@
#include "qapi/qapi-types-common.h" #include "qapi/qapi-types-common.h"
bool hmp_handle_error(Monitor *mon, Error *err); bool hmp_handle_error(Monitor *mon, Error *err);
void hmp_help_cmd(Monitor *mon, const char *name);
void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_name(Monitor *mon, const QDict *qdict);
void hmp_info_version(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict);

2
monitor/hmp.c
View File

@ -272,7 +272,7 @@ static void help_cmd_dump(Monitor *mon, const HMPCommand *cmds,
} }
} }
void help_cmd(Monitor *mon, const char *name) void hmp_help_cmd(Monitor *mon, const char *name)
{ {
char *args[MAX_ARGS]; char *args[MAX_ARGS];
int nb_args = 0; int nb_args = 0;

8
monitor/misc.c
View File

@ -153,7 +153,7 @@ int hmp_compare_cmd(const char *name, const char *list)
static void do_help_cmd(Monitor *mon, const QDict *qdict) static void do_help_cmd(Monitor *mon, const QDict *qdict)
{ {
help_cmd(mon, qdict_get_try_str(qdict, "name")); hmp_help_cmd(mon, qdict_get_try_str(qdict, "name"));
} }
static void hmp_trace_event(Monitor *mon, const QDict *qdict) static void hmp_trace_event(Monitor *mon, const QDict *qdict)
@ -195,14 +195,14 @@ static void hmp_trace_file(Monitor *mon, const QDict *qdict)
} }
} else { } else {
monitor_printf(mon, "unexpected argument \"%s\"\n", op); monitor_printf(mon, "unexpected argument \"%s\"\n", op);
help_cmd(mon, "trace-file"); hmp_help_cmd(mon, "trace-file");
} }
} }
#endif #endif
static void hmp_info_help(Monitor *mon, const QDict *qdict) static void hmp_info_help(Monitor *mon, const QDict *qdict)
{ {
help_cmd(mon, "info"); hmp_help_cmd(mon, "info");
} }
static void monitor_init_qmp_commands(void) static void monitor_init_qmp_commands(void)
@ -424,7 +424,7 @@ static void hmp_log(Monitor *mon, const QDict *qdict)
} else { } else {
mask = qemu_str_to_log_mask(items); mask = qemu_str_to_log_mask(items);
if (!mask) { if (!mask) {
help_cmd(mon, "log"); hmp_help_cmd(mon, "log");
return; return;
} }
} }

1
monitor/monitor-internal.h
View File

@ -186,7 +186,6 @@ void monitor_data_destroy_qmp(MonitorQMP *mon);
void coroutine_fn monitor_qmp_dispatcher_co(void *data); void coroutine_fn monitor_qmp_dispatcher_co(void *data);
int get_monitor_def(Monitor *mon, int64_t *pval, const char *name); int get_monitor_def(Monitor *mon, int64_t *pval, const char *name);
void help_cmd(Monitor *mon, const char *name);
void handle_hmp_command(MonitorHMP *mon, const char *cmdline); void handle_hmp_command(MonitorHMP *mon, const char *cmdline);
int hmp_compare_cmd(const char *name, const char *list); int hmp_compare_cmd(const char *name, const char *list);