From patchwork Thu Oct 1 15:50:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 34740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 61B26B7B9E for ; Fri, 2 Oct 2009 02:07:31 +1000 (EST) Received: from localhost ([127.0.0.1]:52069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtOBk-00062v-N6 for incoming@patchwork.ozlabs.org; Thu, 01 Oct 2009 12:07:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtNwH-0007TU-Fs for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtNwC-0007LV-Ci for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:28 -0400 Received: from [199.232.76.173] (port=54689 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtNwC-0007Ku-2k for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51488) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtNwB-0003dM-JI for qemu-devel@nongnu.org; Thu, 01 Oct 2009 11:51:23 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n91FpMEg010962; Thu, 1 Oct 2009 11:51:23 -0400 Received: from localhost (vpn-12-143.rdu.redhat.com [10.11.12.143]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n91FpLxr010028; Thu, 1 Oct 2009 11:51:22 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 1 Oct 2009 12:50:37 -0300 Message-Id: <1254412245-10452-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254412245-10452-1-git-send-email-lcapitulino@redhat.com> References: <1254412245-10452-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 06/14] monitor: do_info(): handle new and old info handlers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- monitor.c | 43 ++++++++++++++++++++++++++++++++++--------- qemu-monitor.hx | 4 ++-- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index 2bfc592..fecdc63 100644 --- a/monitor.c +++ b/monitor.c @@ -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) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 0da810a..b9c33e5 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -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" },