@@ -212,6 +212,10 @@ static int monitor_fprintf(FILE *stream, const char *fmt, ...)
return 0;
}
+static void monitor_user_noop(Monitor *mon, const QObject *data) { }
+
+static void monitor_error_noop(Monitor *mon, const MonitorError *error) { }
+
static int monitor_handler_ported(const mon_cmd_t *cmd)
{
return cmd->user_print != NULL;
@@ -312,24 +316,45 @@ static void do_commit(Monitor *mon, const QDict *qdict)
}
}
-static void do_info(Monitor *mon, const QDict *qdict)
+static void do_info(Monitor *mon, const QDict *qdict, QObject **ret_data,
+ MonitorError *error)
{
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++) {
+
+ for (cmd = info_cmds; cmd->name != NULL; cmd++) {
if (compare_cmd(item, cmd->name))
- goto found;
+ break;
}
- help:
- help_cmd(mon, "info");
+
+ if (cmd->name == NULL)
+ goto help;
+
+ if (monitor_handler_ported(cmd)) {
+ void (*handler_new)(Monitor *mon, QObject **ret_data,
+ MonitorError *error);
+
+ handler_new = cmd->handler;
+ handler_new(mon, ret_data, error);
+
+ if (monitor_has_error(error)) {
+ cmd->user_error(mon, error);
+ } else {
+ cmd->user_print(mon, *ret_data);
+ }
+ } else {
+ void (*handler_old)(Monitor *mon);
+ handler_old = cmd->handler;
+ handler_old(mon);
+ }
+
return;
- found:
- handler = cmd->handler;
- handler(mon);
+
+help:
+ help_cmd(mon, "info");
}
static void do_info_version(Monitor *mon)
@@ -43,8 +43,8 @@ ETEXI
.name = "info",
.args_type = "item:s?",
.handler = do_info,
- .user_print = NULL,
- .user_error = NULL,
+ .user_print = monitor_user_noop,
+ .user_error = monitor_error_noop,
.params = "[subcommand]",
.help = "show various information about the system state"
},
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 converts do_info() to the new QObject style and makes the appropriate changes so that it can handle both info handlers styles. In the future, when all handlers are converted to QObject's style, it will be possible to share more code with monitor_handle_command(). This commit also introduces two new functions that should be used by handlers which do not have data to print: - monitor_user_noop() - monitor_error_noop() This is the case of do_info(). Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- monitor.c | 43 ++++++++++++++++++++++++++++++++++--------- qemu-monitor.hx | 4 ++-- 2 files changed, 36 insertions(+), 11 deletions(-)