From patchwork Wed Jun 23 15:46:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 56692 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 38D0BB6F29 for ; Thu, 24 Jun 2010 02:04:08 +1000 (EST) Received: from localhost ([127.0.0.1]:41190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORSQm-0008DE-VI for incoming@patchwork.ozlabs.org; Wed, 23 Jun 2010 12:04:05 -0400 Received: from [140.186.70.92] (port=41296 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORSAP-0006GD-Jz for qemu-devel@nongnu.org; Wed, 23 Jun 2010 11:47:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ORSAO-0008CE-J0 for qemu-devel@nongnu.org; Wed, 23 Jun 2010 11:47:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60221) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ORSAO-0008C9-8M for qemu-devel@nongnu.org; Wed, 23 Jun 2010 11:47:08 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NFl7Rm018449 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 23 Jun 2010 11:47:07 -0400 Received: from localhost (vpn-10-43.rdu.redhat.com [10.11.10.43]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5NFl5eX019103; Wed, 23 Jun 2010 11:47:06 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 23 Jun 2010 12:46:58 -0300 Message-Id: <1277308019-17008-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1277308019-17008-1-git-send-email-lcapitulino@redhat.com> References: <1277308019-17008-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 1/2] QMP: Fix error reporting in the async API 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 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 170b269..ba7d5d9 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) @@ -4232,7 +4232,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); }