From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzhUY-0001m0-IY for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:24:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzhUV-0000jr-Kf for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:24:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzhUV-0000jO-GI for qemu-devel@nongnu.org; Tue, 02 Jun 2015 04:24:07 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3775191768 for ; Tue, 2 Jun 2015 08:24:07 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t528O5ce000420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 2 Jun 2015 04:24:06 -0400 From: Markus Armbruster Date: Tue, 2 Jun 2015 10:23:54 +0200 Message-Id: <1433233439-3386-17-git-send-email-armbru@redhat.com> In-Reply-To: <1433233439-3386-1-git-send-email-armbru@redhat.com> References: <1433233439-3386-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 16/21] monitor: Rename monitor_control_read(), monitor_control_event() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ... to monitor_qmp_read(), monitor_qmp_event(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- monitor.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/monitor.c b/monitor.c index a39cd6c..5c2aa27 100644 --- a/monitor.c +++ b/monitor.c @@ -5042,10 +5042,7 @@ err_out: QDECREF(args); } -/** - * monitor_control_read(): Read and handle QMP input - */ -static void monitor_control_read(void *opaque, const uint8_t *buf, int size) +static void monitor_qmp_read(void *opaque, const uint8_t *buf, int size) { Monitor *old_mon = cur_mon; @@ -5110,10 +5107,7 @@ static QObject *get_qmp_greeting(void) return qobject_from_jsonf("{'QMP':{'version': %p,'capabilities': []}}",ver); } -/** - * monitor_control_event(): Print QMP gretting - */ -static void monitor_control_event(void *opaque, int event) +static void monitor_qmp_event(void *opaque, int event) { QObject *data; Monitor *mon = opaque; @@ -5263,8 +5257,8 @@ void monitor_init(CharDriverState *chr, int flags) if (monitor_ctrl_mode(mon)) { mon->mc = g_malloc0(sizeof(MonitorControl)); /* Control mode requires special handlers */ - qemu_chr_add_handlers(chr, monitor_can_read, monitor_control_read, - monitor_control_event, mon); + qemu_chr_add_handlers(chr, monitor_can_read, monitor_qmp_read, + monitor_qmp_event, mon); qemu_chr_fe_set_echo(chr, true); json_message_parser_init(&mon->mc->parser, handle_qmp_command); -- 1.9.3