@@ -208,6 +208,11 @@ static int monitor_fprintf(FILE *stream, const char *fmt, ...)
return 0;
}
+static void monitor_print_nothing(Monitor *mon, const QObject *data)
+{
+ return;
+}
+
static int compare_cmd(const char *name, const char *list)
{
const char *p, *pstart;
@@ -277,24 +282,40 @@ static void do_commit(Monitor *mon, const QDict *qdict)
}
}
-static void do_info(Monitor *mon, const QDict *qdict)
+static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
+ int ret;
const mon_cmd_t *cmd;
const char *item = qdict_get_try_str(qdict, "item");
- void (*handler)(Monitor *);
- if (!item)
- goto help;
- for(cmd = info_cmds; cmd->name != NULL; cmd++) {
+ if (!item) {
+ help_cmd(mon, "info");
+ return 0;
+ }
+
+ for (cmd = info_cmds; cmd->name != NULL; cmd++) {
if (compare_cmd(item, cmd->name))
- goto found;
+ break;
}
- help:
- help_cmd(mon, "info");
- return;
- found:
- handler = cmd->handler;
- handler(mon);
+
+ if (cmd->name == NULL)
+ return -1;
+
+ ret = 0;
+ if (cmd->user_print) {
+ int (*handler_new)(Monitor *mon, QObject **ret_data);
+
+ handler_new = cmd->handler;
+ ret = handler_new(mon, ret_data);
+
+ cmd->user_print(mon, *ret_data);
+ } else {
+ void (*handler_old)(Monitor *);
+ handler_old = cmd->handler;
+ handler_old(mon);
+ }
+
+ return ret;
}
static void do_info_version(Monitor *mon)
@@ -22,7 +22,7 @@ STEXI
Commit changes to the disk images (if -snapshot is used) or backing files.
ETEXI
- { "info", "item:s?", do_info, NULL,
+ { "info", "item:s?", do_info, monitor_print_nothing,
"[subcommand]", "show various information about the system state" },
STEXI
@item info @var{subcommand}
do_info() is special, its job is to call 'info handlers'. This is similar to what monitor_handle_command() does, therefore do_info() also has to distinguish among new and old style info handlers. This commit ports do_info() to call info handlers according to the new QObject style. It's important to note that: 1. the return value of do_info() will be the same of the called handler 2. monitor_print_nothing() will be used by handlers to... print nothing :) Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- monitor.c | 45 +++++++++++++++++++++++++++++++++------------ qemu-monitor.hx | 2 +- 2 files changed, 34 insertions(+), 13 deletions(-)