Eric Blake <ebl...@redhat.com> writes: > On 05/22/2015 05:36 AM, Markus Armbruster wrote: >> While there, rename its type as well, from MonitorControl to >> MonitorQMP. >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> --- >> monitor.c | 35 ++++++++++++++++------------------- >> 1 file changed, 16 insertions(+), 19 deletions(-) >> > >> @@ -5255,14 +5255,11 @@ void monitor_init(CharDriverState *chr, int flags) >> monitor_read_command(mon, 0); >> } >> >> - if (monitor_ctrl_mode(mon)) { >> - mon->mc = g_malloc0(sizeof(MonitorControl)); >> - /* Control mode requires special handlers */ >> + if (flags & MONITOR_USE_CONTROL) { > > You also inlined this use of monitor_ctrl_mode; worth mentioning in the > commit message? Or should it have been swapped to monitor_is_qmp() in > patch 19?
I'll do either one or the other. > Reviewed-by: Eric Blake <ebl...@redhat.com> Thanks!