diff options
| -rw-r--r-- | monitor/hmp.c | 6 | ||||
| -rw-r--r-- | monitor/misc.c | 2 | ||||
| -rw-r--r-- | monitor/monitor-internal.h | 8 | ||||
| -rw-r--r-- | monitor/monitor.c | 14 | ||||
| -rw-r--r-- | monitor/qmp.c | 7 |
5 files changed, 22 insertions, 15 deletions
diff --git a/monitor/hmp.c b/monitor/hmp.c index cbbee6477a..379e366984 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1398,12 +1398,12 @@ static void monitor_readline_flush(void *opaque) void monitor_init_hmp(Chardev *chr, int flags) { MonitorHMP *mon = g_new0(MonitorHMP, 1); - bool use_readline = flags & MONITOR_USE_READLINE; - monitor_data_init(&mon->common, flags, false, false); + monitor_data_init(&mon->common, false, false, false); qemu_chr_fe_init(&mon->common.chr, chr, &error_abort); - if (use_readline) { + mon->use_readline = flags & MONITOR_USE_READLINE; + if (mon->use_readline) { mon->rs = readline_init(monitor_readline_printf, monitor_readline_flush, mon, diff --git a/monitor/misc.c b/monitor/misc.c index 6e3d580ae7..bf9faceb86 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -121,7 +121,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index, Monitor *old_mon; MonitorHMP hmp = {}; - monitor_data_init(&hmp.common, 0, true, false); + monitor_data_init(&hmp.common, false, true, false); old_mon = cur_mon; cur_mon = &hmp.common; diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index b4996c14ac..03ea0239ef 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -86,8 +86,8 @@ typedef struct HMPCommand { struct Monitor { CharBackend chr; int reset_seen; - int flags; int suspend_cnt; /* Needs to be accessed atomically */ + bool is_qmp; bool skip_flush; bool use_io_thread; @@ -112,6 +112,7 @@ struct Monitor { struct MonitorHMP { Monitor common; + bool use_readline; /* * State used only in the thread "owning" the monitor. * If @use_io_thread, this is @mon_iothread. (This does not actually happen @@ -125,6 +126,7 @@ struct MonitorHMP { typedef struct { Monitor common; JSONMessageParser parser; + bool pretty; /* * When a client connects, we're in capabilities negotiation mode. * @commands is &qmp_cap_negotiation_commands then. When command @@ -148,7 +150,7 @@ typedef struct { */ static inline bool monitor_is_qmp(const Monitor *mon) { - return mon->flags & MONITOR_USE_CONTROL; + return mon->is_qmp; } typedef QTAILQ_HEAD(MonitorList, Monitor) MonitorList; @@ -165,7 +167,7 @@ void monitor_init_qmp(Chardev *chr, int flags); void monitor_init_hmp(Chardev *chr, int flags); int monitor_puts(Monitor *mon, const char *str); -void monitor_data_init(Monitor *mon, int flags, bool skip_flush, +void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, bool use_io_thread); void monitor_data_destroy(Monitor *mon); int monitor_can_read(void *opaque); diff --git a/monitor/monitor.c b/monitor/monitor.c index db3d5ece99..3f4808240a 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -78,14 +78,18 @@ bool monitor_cur_is_qmp(void) * Note: not all HMP monitors use readline, e.g., gdbserver has a * non-interactive HMP monitor, so readline is not used there. */ -static inline bool monitor_uses_readline(const Monitor *mon) +static inline bool monitor_uses_readline(const MonitorHMP *mon) { - return mon->flags & MONITOR_USE_READLINE; + return mon->use_readline; } static inline bool monitor_is_hmp_non_interactive(const Monitor *mon) { - return !monitor_is_qmp(mon) && !monitor_uses_readline(mon); + if (monitor_is_qmp(mon)) { + return false; + } + + return !monitor_uses_readline(container_of(mon, MonitorHMP, common)); } static void monitor_flush_locked(Monitor *mon); @@ -521,17 +525,17 @@ static void monitor_iothread_init(void) mon_iothread = iothread_create("mon_iothread", &error_abort); } -void monitor_data_init(Monitor *mon, int flags, bool skip_flush, +void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, bool use_io_thread) { if (use_io_thread && !mon_iothread) { monitor_iothread_init(); } qemu_mutex_init(&mon->mon_lock); + mon->is_qmp = is_qmp; mon->outbuf = qstring_new(); mon->skip_flush = skip_flush; mon->use_io_thread = use_io_thread; - mon->flags = flags; } void monitor_data_destroy(Monitor *mon) diff --git a/monitor/qmp.c b/monitor/qmp.c index 7c3d081a72..940649f688 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -87,8 +87,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rsp) const QObject *data = QOBJECT(rsp); QString *json; - json = mon->common.flags & MONITOR_USE_PRETTY ? - qobject_to_json_pretty(data) : qobject_to_json(data); + json = mon->pretty ? qobject_to_json_pretty(data) : qobject_to_json(data); assert(json != NULL); qstring_append_chr(json, '\n'); @@ -373,9 +372,11 @@ void monitor_init_qmp(Chardev *chr, int flags) assert(!(flags & MONITOR_USE_READLINE)); /* Note: we run QMP monitor in I/O thread when @chr supports that */ - monitor_data_init(&mon->common, flags, false, + monitor_data_init(&mon->common, true, false, qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT)); + mon->pretty = flags & MONITOR_USE_PRETTY; + qemu_mutex_init(&mon->qmp_queue_lock); mon->qmp_requests = g_queue_new(); |