falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitor: Drop unused "new" HMP command interface 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2015-03-05 18:50:05 +01:00
parent 04e00c92ef
commit 8a4f501c09
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
monitor.c
View File

@ -123,7 +123,6 @@ typedef struct mon_cmd_t {
const char *args_type; const char *args_type;
const char *params; const char *params;
const char *help; const char *help;
void (*user_print)(Monitor *mon, const QObject *data);
union { union {
void (*cmd)(Monitor *mon, const QDict *qdict); void (*cmd)(Monitor *mon, const QDict *qdict);
int (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data); int (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data);
@ -378,11 +377,6 @@ static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream,
return 0; return 0;
} }
static inline int handler_is_qobject(const mon_cmd_t *cmd)
{
return cmd->user_print != NULL;
}
static inline int monitor_has_error(const Monitor *mon) static inline int monitor_has_error(const Monitor *mon)
{ {
return mon->error != NULL; return mon->error != NULL;
@ -4045,24 +4039,10 @@ static void handle_user_command(Monitor *mon, const char *cmdline)
qdict = qdict_new(); qdict = qdict_new();
cmd = monitor_parse_command(mon, cmdline, 0, mon->cmd_table, qdict); cmd = monitor_parse_command(mon, cmdline, 0, mon->cmd_table, qdict);
if (!cmd) if (cmd) {
goto out;
if (handler_is_qobject(cmd)) {
QObject *data = NULL;
/* XXX: ignores the error code */
cmd->mhandler.cmd_new(mon, qdict, &data);
assert(!monitor_has_error(mon));
if (data) {
cmd->user_print(mon, data);
qobject_decref(data);
}
} else {
cmd->mhandler.cmd(mon, qdict); cmd->mhandler.cmd(mon, qdict);
} }
out:
QDECREF(qdict); QDECREF(qdict);
} }