From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50890 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1QC3-0001v6-Mp for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P1QC2-0003dl-TQ for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P1QC2-0003dd-KK for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:30 -0400 From: Luiz Capitulino Date: Thu, 30 Sep 2010 17:56:18 -0300 Message-Id: <1285880180-29724-18-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1285880180-29724-1-git-send-email-lcapitulino@redhat.com> References: <1285880180-29724-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 17/19] Monitor: Directly call QObject 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, armbru@redhat.com This avoids handle_user_command() calling monitor_call_handler(), which is currently shared with QMP. Signed-off-by: Luiz Capitulino --- monitor.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index a48f919..adc5bbd 100644 --- a/monitor.c +++ b/monitor.c @@ -3914,7 +3914,15 @@ static void handle_user_command(Monitor *mon, const char *cmdline) if (handler_is_async(cmd)) { user_async_cmd_handler(mon, cmd, qdict); } else if (handler_is_qobject(cmd)) { - monitor_call_handler(mon, cmd, qdict); + QObject *data = NULL; + + /* XXX: ignores the error code */ + cmd->mhandler.cmd_new(mon, qdict, &data); + assert(!monitor_has_error(mon)); + if (data) { + cmd->user_print(mon, data); + qobject_decref(data); + } } else { cmd->mhandler.cmd(mon, qdict); } -- 1.7.3.1.45.g9855b