| Message ID | 1432294585-5984-16-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/22/2015 05:36 AM, Markus Armbruster wrote: > ... to monitor_qmp_read(), monitor_qmp_event(). > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > monitor.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) Not a trivial rename based on diffstat, but... > > diff --git a/monitor.c b/monitor.c > index ecadda7..977c0fd 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) Drops a comment, but the comment didn't add much. > { > 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) Drops a typo in the otherwise useless comment. (I'm surprised numerous scans for spelling cleanups haven't yet flagged "gretting" as unusual). ...so I'm okay with it. Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/monitor.c b/monitor.c index ecadda7..977c0fd 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);
... to monitor_qmp_read(), monitor_qmp_event(). Signed-off-by: Markus Armbruster <armbru@redhat.com> --- monitor.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)