The monitor_is_hmp_non_interactive method is used by
monitor_suspend and monitor_resume, to make them a no-op
if the HMP does not use readline.
There are only a handful of callers of suspend/resume and
they can be made to skip the call with readline is not
present.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
include/monitor/monitor.h | 2 +-
migration/migration-hmp-cmds.c | 5 ++++-
monitor/hmp-cmds.c | 5 ++++-
monitor/hmp.c | 14 +++++++++-----
monitor/monitor-internal.h | 1 -
monitor/monitor.c | 30 +-----------------------------
6 files changed, 19 insertions(+), 38 deletions(-)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index f66e465775..52df053c6d 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -34,7 +34,7 @@ int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp);
int monitor_new_opts(QemuOpts *opts, Error **errp);
void monitor_cleanup(void);
-int monitor_suspend(Monitor *mon);
+void monitor_suspend(Monitor *mon);
void monitor_resume(Monitor *mon);
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index 0a193b8f54..e9bb970b20 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -18,6 +18,7 @@
#include "migration/snapshot.h"
#include "monitor/hmp.h"
#include "monitor/monitor.h"
+#include "monitor/monitor-internal.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-visit-migration.h"
@@ -836,12 +837,14 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
if (!detach) {
HMPMigrationStatus *status;
+ MonitorHMP *hmp = MONITOR_HMP(mon);
- if (monitor_suspend(mon) < 0) {
+ if (!hmp->rs) {
monitor_printf(mon, "terminal does not allow synchronous "
"migration, continuing detached\n");
return;
}
+ monitor_suspend(mon);
status = g_malloc0(sizeof(*status));
status->mon = mon;
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 911d984cbe..a6314c1159 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -90,7 +90,10 @@ void hmp_info_version(Monitor *mon, const QDict *qdict)
void hmp_quit(Monitor *mon, const QDict *qdict)
{
- monitor_suspend(mon);
+ MonitorHMP *hmp = MONITOR_HMP(mon);
+ if (hmp->rs) {
+ monitor_suspend(mon);
+ }
qmp_quit(NULL);
}
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 5f9373a87b..387dab2567 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -1491,13 +1491,16 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size)
static void monitor_event(void *opaque, QEMUChrEvent event)
{
Monitor *mon = opaque;
+ MonitorHMP *hmp = MONITOR_HMP(mon);
switch (event) {
case CHR_EVENT_MUX_IN:
qemu_mutex_lock(&mon->mon_lock);
if (mon->mux_out) {
mon->mux_out = 0;
- monitor_resume(mon);
+ if (hmp->rs) {
+ monitor_resume(mon);
+ }
}
qemu_mutex_unlock(&mon->mon_lock);
break;
@@ -1510,7 +1513,9 @@ static void monitor_event(void *opaque, QEMUChrEvent event)
} else {
monitor_flush_locked(mon);
}
- monitor_suspend(mon);
+ if (hmp->rs) {
+ monitor_suspend(mon);
+ }
mon->mux_out = 1;
}
qemu_mutex_unlock(&mon->mon_lock);
@@ -1521,7 +1526,7 @@ static void monitor_event(void *opaque, QEMUChrEvent event)
"information\n", QEMU_VERSION);
qemu_mutex_lock(&mon->mon_lock);
mon->reset_seen = 1;
- if (!mon->mux_out) {
+ if (!mon->mux_out && hmp->rs) {
/* Suspend-resume forces the prompt to be printed. */
monitor_suspend(mon);
monitor_resume(mon);
@@ -1569,8 +1574,7 @@ void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)
return;
}
- mon->use_readline = use_readline;
- if (mon->use_readline) {
+ if (use_readline) {
mon->rs = readline_init(monitor_readline_printf,
monitor_readline_flush,
mon,
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
index d40fdde793..7557deb978 100644
--- a/monitor/monitor-internal.h
+++ b/monitor/monitor-internal.h
@@ -133,7 +133,6 @@ struct MonitorHMPClass {
struct MonitorHMP {
Monitor parent;
- 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
diff --git a/monitor/monitor.c b/monitor/monitor.c
index f48603a7e8..3860486a32 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -130,25 +130,6 @@ Monitor *monitor_set_cur(Coroutine *co, Monitor *mon)
return old_monitor;
}
-/**
- * Is @mon is using readline?
- * 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 MonitorHMP *mon)
-{
- return mon->use_readline;
-}
-
-static inline bool monitor_is_hmp_non_interactive(const Monitor *mon)
-{
- if (!object_dynamic_cast(OBJECT(mon), TYPE_MONITOR_HMP)) {
- return false;
- }
-
- return !monitor_uses_readline(container_of(mon, MonitorHMP, parent));
-}
-
static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond,
void *opaque)
{
@@ -523,12 +504,8 @@ static gboolean qapi_event_throttle_equal(const void *a, const void *b)
return TRUE;
}
-int monitor_suspend(Monitor *mon)
+void monitor_suspend(Monitor *mon)
{
- if (monitor_is_hmp_non_interactive(mon)) {
- return -ENOTTY;
- }
-
qatomic_inc(&mon->suspend_cnt);
if (mon->use_io_thread) {
@@ -540,7 +517,6 @@ int monitor_suspend(Monitor *mon)
}
trace_monitor_suspend(mon, 1);
- return 0;
}
static void monitor_accept_input(void *opaque)
@@ -557,10 +533,6 @@ static void monitor_accept_input(void *opaque)
void monitor_resume(Monitor *mon)
{
- if (monitor_is_hmp_non_interactive(mon)) {
- return;
- }
-
if (qatomic_dec_fetch(&mon->suspend_cnt) == 0) {
AioContext *ctx;
--
2.53.0