From: Markus Armbruster <armbru@redhat.com>
Date: Fri, 6 Mar 2015 18:20:51 +0000 (+0100)
Subject: monitor: Rename monitor_control_read(), monitor_control_event()
X-Git-Tag: v2.4.0-rc0~103^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c83fe23b58199a6d4a938305cb0fc45fe7729b61;p=thirdparty%2Fqemu.git

monitor: Rename monitor_control_read(), monitor_control_event()

... to monitor_qmp_read(), monitor_qmp_event().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
---

diff --git a/monitor.c b/monitor.c
index a39cd6cd984..5c2aa2789d2 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);