From patchwork Wed Oct 7 00:27:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 35177 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 5A391B7B78 for ; Wed, 7 Oct 2009 11:36:25 +1100 (EST) Received: from localhost ([127.0.0.1]:58292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvKVx-0004BD-NU for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2009 20:36:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvKNZ-0001W9-U9 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvKNU-0001S3-S3 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:41 -0400 Received: from [199.232.76.173] (port=45744 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvKNU-0001Ro-HR for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18596) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvKNU-00073l-4C for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:36 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n970RZxv026470; Tue, 6 Oct 2009 20:27:35 -0400 Received: from localhost (vpn-12-79.rdu.redhat.com [10.11.12.79]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n970RXsB019525; Tue, 6 Oct 2009 20:27:34 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 6 Oct 2009 21:27:02 -0300 Message-Id: <1254875232-25012-6-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 05/15] monitor: Handle new and old style 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 This commit changes monitor_handle_command() to support old style _and_ new style handlers. New style handlers are protocol independent, they return their data to the Monitor, which in turn decides how to print them (ie. user protocol vs. machine protocol). Converted handlers will use the 'user_print' member of 'mon_cmd_t' to define its user protocol function, which will be called to print data in the user protocol format. Handlers which don't have 'user_print' defined are not converted and are handled as usual. Signed-off-by: Luiz Capitulino --- monitor.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 9d4c168..c0ba5ee 100644 --- a/monitor.c +++ b/monitor.c @@ -211,6 +211,11 @@ static int monitor_fprintf(FILE *stream, const char *fmt, ...) return 0; } +static inline int monitor_handler_ported(const mon_cmd_t *cmd) +{ + return cmd->user_print != NULL; +} + static int compare_cmd(const char *name, const char *list) { const char *p, *pstart; @@ -3053,17 +3058,32 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) qdict = qdict_new(); cmd = monitor_parse_command(mon, cmdline, qdict); - if (cmd) { - void (*handler)(Monitor *mon, const QDict *qdict); + if (!cmd) + goto out; + + qemu_errors_to_mon(mon); - qemu_errors_to_mon(mon); + if (monitor_handler_ported(cmd)) { + QObject *data = NULL; + void (*handler_new)(Monitor *mon, const QDict *params, + QObject **ret_data); - handler = cmd->handler; - handler(mon, qdict); + handler_new = cmd->handler; + handler_new(mon, qdict, &data); - qemu_errors_to_previous(); + if (data) + cmd->user_print(mon, data); + + qobject_decref(data); + } else { + void (*handler_old)(Monitor *mon, const QDict *qdict); + handler_old = cmd->handler; + handler_old(mon, qdict); } + qemu_errors_to_previous(); + +out: QDECREF(qdict); }