From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37638 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUPL5-0006Ty-EP for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUPKw-0007Jz-HA for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35987) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUPKw-0007Jg-AO for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:14 -0400 From: Luiz Capitulino Date: Thu, 1 Jul 2010 16:21:35 -0300 Message-Id: <1278012111-26227-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1278012111-26227-1-git-send-email-lcapitulino@redhat.com> References: <1278012111-26227-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 07/23] QMP: Fix error reporting in the async API List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: qemu-devel@nongnu.org The current asynchronous command API doesn't return a QMP response when the async command fails. This is easy to reproduce with the balloon command (the sole async command we have so far): run qemu w/o the '-balloon virtio' option and try to issue the balloon command via QMP: no response will be sent to the client. This commit fixes the problem by making qmp_async_cmd_handler() return the handler's error code and then calling monitor_protocol_emitter() if the handler has returned an error. Signed-off-by: Luiz Capitulino --- monitor.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index 980e98d..58b060b 100644 --- a/monitor.c +++ b/monitor.c @@ -546,10 +546,10 @@ static void qmp_monitor_complete(void *opaque, QObject *ret_data) monitor_protocol_emitter(opaque, ret_data); } -static void qmp_async_cmd_handler(Monitor *mon, const mon_cmd_t *cmd, - const QDict *params) +static int qmp_async_cmd_handler(Monitor *mon, const mon_cmd_t *cmd, + const QDict *params) { - cmd->mhandler.cmd_async(mon, params, qmp_monitor_complete, mon); + return cmd->mhandler.cmd_async(mon, params, qmp_monitor_complete, mon); } static void qmp_async_info_handler(Monitor *mon, const mon_cmd_t *cmd) @@ -4239,7 +4239,11 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) } if (monitor_handler_is_async(cmd)) { - qmp_async_cmd_handler(mon, cmd, args); + err = qmp_async_cmd_handler(mon, cmd, args); + if (err) { + /* emit the error response */ + goto err_out; + } } else { monitor_call_handler(mon, cmd, args); } -- 1.7.2.rc0