From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyH2N-00076c-JD for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyH2J-0003eW-Rf for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyH2J-0003eG-Mt for qemu-devel@nongnu.org; Fri, 29 May 2015 05:57: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 4C7C72CD7E9 for ; Fri, 29 May 2015 09:57:07 +0000 (UTC) From: Markus Armbruster Date: Fri, 29 May 2015 11:56:55 +0200 Message-Id: <1432893420-18687-17-git-send-email-armbru@redhat.com> In-Reply-To: <1432893420-18687-1-git-send-email-armbru@redhat.com> References: <1432893420-18687-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 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 Cc: lcapitulino@redhat.com ... 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 ac7d851..cf80d10 100644 --- a/monitor.c +++ b/monitor.c @@ -5043,10 +5043,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; @@ -5111,10 +5108,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; @@ -5264,8 +5258,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