From patchwork Thu Sep 30 20:56:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 66271 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 80981B70AE for ; Fri, 1 Oct 2010 07:26:10 +1000 (EST) Received: from localhost ([127.0.0.1]:58132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1Qdj-0007es-0y for incoming@patchwork.ozlabs.org; Thu, 30 Sep 2010 17:26:07 -0400 Received: from [140.186.70.92] (port=50876 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1QC2-0001u6-Bo for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P1QC1-0003dK-6o for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P1QC0-0003dD-UN for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:29 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8UKvRqp017046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 Sep 2010 16:57:28 -0400 Received: from localhost (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8UKvQFV010082; Thu, 30 Sep 2010 16:57:27 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 30 Sep 2010 17:56:17 -0300 Message-Id: <1285880180-29724-17-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 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 16/19] Monitor: Rename monitor_handler_is_async() 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 Let's follow the convention introduced by the previous commit and call it handler_is_async(). Signed-off-by: Luiz Capitulino --- monitor.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 91473f4..a48f919 100644 --- a/monitor.c +++ b/monitor.c @@ -335,7 +335,7 @@ static inline int handler_is_qobject(const mon_cmd_t *cmd) return cmd->user_print != NULL; } -static inline bool monitor_handler_is_async(const mon_cmd_t *cmd) +static inline bool handler_is_async(const mon_cmd_t *cmd) { return cmd->flags & MONITOR_CMD_ASYNC; } @@ -649,7 +649,7 @@ static void do_info(Monitor *mon, const QDict *qdict) goto help; } - if (monitor_handler_is_async(cmd)) { + if (handler_is_async(cmd)) { user_async_info_handler(mon, cmd); } else if (handler_is_qobject(cmd)) { QObject *info_data = NULL; @@ -3911,7 +3911,7 @@ static void handle_user_command(Monitor *mon, const char *cmdline) if (!cmd) goto out; - if (monitor_handler_is_async(cmd)) { + if (handler_is_async(cmd)) { user_async_cmd_handler(mon, cmd, qdict); } else if (handler_is_qobject(cmd)) { monitor_call_handler(mon, cmd, qdict); @@ -4408,7 +4408,7 @@ static void qmp_call_query_cmd(Monitor *mon, const mon_cmd_t *cmd) { QObject *ret_data = NULL; - if (monitor_handler_is_async(cmd)) { + if (handler_is_async(cmd)) { qmp_async_info_handler(mon, cmd); if (monitor_has_error(mon)) { monitor_protocol_emitter(mon, NULL); @@ -4482,7 +4482,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) if (query_cmd) { qmp_call_query_cmd(mon, cmd); - } else if (monitor_handler_is_async(cmd)) { + } else if (handler_is_async(cmd)) { err = qmp_async_cmd_handler(mon, cmd, args); if (err) { /* emit the error response */