From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39516 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwKxP-0000Te-0c for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwKxN-0001OW-48 for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19401) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwKxM-0001OO-Ry for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:21 -0400 From: Luiz Capitulino Date: Thu, 16 Sep 2010 17:20:51 -0300 Message-Id: <1284668464-15981-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> References: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 05/18] Monitor: Drop is_async_return() 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 If I understood it correcty, the is_async_return() logic was only used to prevent QMP from issuing duplicated success responses for asynchronous handlers. However, QMP doesn't use do_info() anymore so this is dead logic and (hopefully) can be safely dropped. Signed-off-by: Luiz Capitulino --- monitor.c | 25 +------------------------ 1 files changed, 1 insertions(+), 24 deletions(-) diff --git a/monitor.c b/monitor.c index b76e227..1d52362 100644 --- a/monitor.c +++ b/monitor.c @@ -653,12 +653,6 @@ static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) if (monitor_handler_is_async(cmd)) { user_async_info_handler(mon, cmd); - /* - * Indicate that this command is asynchronous and will not return any - * data (not even empty). Instead, the data will be returned via a - * completion callback. - */ - *ret_data = qobject_from_jsonf("{ '__mon_async': 'return' }"); } else if (monitor_handler_ported(cmd)) { QObject *info_data = NULL; @@ -3717,15 +3711,6 @@ void monitor_set_error(Monitor *mon, QError *qerror) } } -static int is_async_return(const QObject *data) -{ - if (data && qobject_type(data) == QTYPE_QDICT) { - return qdict_haskey(qobject_to_qdict(data), "__mon_async"); - } - - return 0; -} - static void handler_audit(Monitor *mon, const mon_cmd_t *cmd, int ret) { if (monitor_ctrl_mode(mon)) { @@ -3784,15 +3769,7 @@ static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd, ret = cmd->mhandler.cmd_new(mon, params, &data); handler_audit(mon, cmd, ret); - if (is_async_return(data)) { - /* - * Asynchronous commands have no initial return data but they can - * generate errors. Data is returned via the async completion handler. - */ - if (monitor_ctrl_mode(mon) && monitor_has_error(mon)) { - monitor_protocol_emitter(mon, NULL); - } - } else if (monitor_ctrl_mode(mon)) { + if (monitor_ctrl_mode(mon)) { /* Monitor Protocol */ monitor_protocol_emitter(mon, data); } else { -- 1.7.3.rc2.dirty