From patchwork Thu Sep 16 20:20:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 64998 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]) by ozlabs.org (Postfix) with ESMTP id 58165B6EF2 for ; Fri, 17 Sep 2010 06:37:00 +1000 (EST) Received: from localhost ([127.0.0.1]:55811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwL3I-0003gP-Px for incoming@patchwork.ozlabs.org; Thu, 16 Sep 2010 16:27:28 -0400 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLKlU023104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Sep 2010 16:21:20 -0400 Received: from localhost ([10.3.113.6]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLJrX007465; Thu, 16 Sep 2010 16:21:19 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 05/18] Monitor: Drop is_async_return() 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 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 {