From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDpBN-0001Zl-2F for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:33 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDpBH-0001V5-FO for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:31 -0500 Received: from [199.232.76.173] (port=48285 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDpBH-0001V0-7O for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41218) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDpBG-0004Oc-D9 for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:26 -0500 From: Luiz Capitulino Date: Thu, 26 Nov 2009 22:58:53 -0200 Message-Id: <1259283550-3597-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> References: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 03/20] monitor: Introduce monitor_call_handler() 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, armbru@redhat.com This commit moves the code which calls Monitor handlers to its own function, as it will be used by QMP code as well. Signed-off-by: Luiz Capitulino --- monitor.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/monitor.c b/monitor.c index 4d18699..e0cc941 100644 --- a/monitor.c +++ b/monitor.c @@ -3272,6 +3272,18 @@ static void monitor_print_error(Monitor *mon) mon->error = NULL; } +static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd, + const QDict *params) +{ + QObject *data = NULL; + + cmd->mhandler.cmd_new(mon, params, &data); + if (data) + cmd->user_print(mon, data); + + qobject_decref(data); +} + static void monitor_handle_command(Monitor *mon, const char *cmdline) { QDict *qdict; @@ -3286,13 +3298,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) qemu_errors_to_mon(mon); if (monitor_handler_ported(cmd)) { - QObject *data = NULL; - - cmd->mhandler.cmd_new(mon, qdict, &data); - if (data) - cmd->user_print(mon, data); - - qobject_decref(data); + monitor_call_handler(mon, cmd, qdict); } else { cmd->mhandler.cmd(mon, qdict); } -- 1.6.6.rc0.50.gaf06e