From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvLYN-0004PM-8Q for qemu-devel@nongnu.org; Tue, 06 Oct 2009 21:42:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvLYI-0004Nj-JV for qemu-devel@nongnu.org; Tue, 06 Oct 2009 21:42:54 -0400 Received: from [199.232.76.173] (port=37461 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvLYI-0004Ng-3P for qemu-devel@nongnu.org; Tue, 06 Oct 2009 21:42:50 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:44272) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MvLYH-0007F9-Nh for qemu-devel@nongnu.org; Tue, 06 Oct 2009 21:42:49 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e8.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id n971eCnN001742 for ; Tue, 6 Oct 2009 21:40:12 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n971gnqX115728 for ; Tue, 6 Oct 2009 21:42:49 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n971gmAK020394 for ; Tue, 6 Oct 2009 21:42:48 -0400 Message-ID: <4ACBF217.60300@us.ibm.com> Date: Tue, 06 Oct 2009 20:42:47 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1254875232-25012-1-git-send-email-lcapitulino@redhat.com> <1254875232-25012-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254875232-25012-6-git-send-email-lcapitulino@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 05/15] monitor: Handle new and old style handlers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org, avi@redhat.com Luiz Capitulino wrote: > 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); > Screams to be a typedef. > - handler = cmd->handler; > - handler(mon, qdict); > + handler_new = cmd->handler; > + handler_new(mon, qdict, &data); > At this point, couldn't cmd->handler be a union so we had a bit more type safety? -- Regards, Anthony Liguori