From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvKNc-0001YR-O3 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvKNX-0001UQ-RQ for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:44 -0400 Received: from [199.232.76.173] (port=45745 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvKNX-0001U7-84 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55630) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvKNW-000744-RQ for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:39 -0400 From: Luiz Capitulino Date: Tue, 6 Oct 2009 21:27:03 -0300 Message-Id: <1254875232-25012-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254875232-25012-1-git-send-email-lcapitulino@redhat.com> References: <1254875232-25012-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 06/15] monitor: do_info(): handle new and old info handlers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, avi@redhat.com 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 a new function called monitor_user_noop(), it should be used by handlers which do not have data to print. This is the case of do_info(). Signed-off-by: Luiz Capitulino --- monitor.c | 36 +++++++++++++++++++++++++++--------- qemu-monitor.hx | 2 +- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/monitor.c b/monitor.c index c0ba5ee..81f3785 100644 --- a/monitor.c +++ b/monitor.c @@ -211,6 +211,8 @@ static int monitor_fprintf(FILE *stream, const char *fmt, ...) return 0; } +static void monitor_user_noop(Monitor *mon, const QObject *data) { } + static inline int monitor_handler_ported(const mon_cmd_t *cmd) { return cmd->user_print != NULL; @@ -285,24 +287,40 @@ 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) { 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); + + handler_new = cmd->handler; + handler_new(mon, ret_data); + + if (*ret_data) + 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) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index dfd0951..170c6ae 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -41,7 +41,7 @@ ETEXI .name = "info", .args_type = "item:s?", .handler = do_info, - .user_print = NULL, + .user_print = monitor_user_noop, .params = "[subcommand]", .help = "show various information about the system state" }, -- 1.6.5.rc2.17.gdbc1b