{"id":2222024,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222024/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-17-berrange@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260410160458.3778874-17-berrange@redhat.com>","date":"2026-04-10T16:04:57","name":"[16/17] monitor: eliminate monitor_is_hmp_non_interactive method","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cb498075e02b436c6b8a540fbc038572c96476b4","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/1.1/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-17-berrange@redhat.com/mbox/","series":[{"id":499483,"url":"http://patchwork.ozlabs.org/api/1.1/series/499483/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499483","date":"2026-04-10T16:04:41","name":"monitor: turn QMP and HMP into QOM objects","version":1,"mbox":"http://patchwork.ozlabs.org/series/499483/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222024/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222024/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Cq5utwsJ;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fshWZ4w11z1yGb\n\tfor ; Sat, 11 Apr 2026 02:06:50 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wBENY-0005Nt-9f; Fri, 10 Apr 2026 12:06:46 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBEN6-0004ST-3g\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:06:17 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBEN2-0006au-S6\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:06:15 -0400","from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-377-SFpPaZ2PPGmISU_B3sNI7A-1; Fri,\n 10 Apr 2026 12:06:05 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id D8FBC1956095; Fri, 10 Apr 2026 16:06:03 +0000 (UTC)","from toolbx.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com\n [10.2.32.101])\n by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 8945A1956056; Fri, 10 Apr 2026 16:06:00 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837168;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=CTXWR1q0+DOQ7/YKsNUH2tLiIcL9JM619frqTvcBYQ0=;\n b=Cq5utwsJQvGPvfPNiD5s+KhlqZIrCB7ihZ0gMEUiKkjagTULxHT+blQWkaRNfzD4/3yVMy\n u6P63teU8RumHyjk3a1DMnTUtUAtvJI0hnDbaxFSF+4eF0+Acc75NU3EIa5klspaSBEyeO\n JCKjPb8Alkwe2be5qUgp/qwCM/Ks3S4=","X-MC-Unique":"SFpPaZ2PPGmISU_B3sNI7A-1","X-Mimecast-MFC-AGG-ID":"SFpPaZ2PPGmISU_B3sNI7A_1775837164","From":"=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= ","To":"qemu-devel@nongnu.org","Cc":"Paolo Bonzini ,\n Markus Armbruster ,\n Christian Brauner ,\n =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?=\n\t=?utf-8?q?athieu-Daud=C3=A9?= ,\n Fabiano Rosas ,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n Peter Xu , Kevin Wolf , =?utf-8?q?Dani?=\n\t=?utf-8?q?el_P=2E_Berrang=C3=A9?= ,\n qemu-block@nongnu.org, \"Dr. David Alan Gilbert\" ,\n Eric Blake ","Subject":"[PATCH 16/17] monitor: eliminate monitor_is_hmp_non_interactive\n method","Date":"Fri, 10 Apr 2026 17:04:57 +0100","Message-ID":"<20260410160458.3778874-17-berrange@redhat.com>","In-Reply-To":"<20260410160458.3778874-1-berrange@redhat.com>","References":"<20260410160458.3778874-1-berrange@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=berrange@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"7","X-Spam_score":"0.7","X-Spam_bar":"/","X-Spam_report":"(0.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"The monitor_is_hmp_non_interactive method is used by\nmonitor_suspend and monitor_resume, to make them a no-op\nif the HMP does not use readline.\n\nThere are only a handful of callers of suspend/resume and\nthey can be made to skip the call with readline is not\npresent.\n\nSigned-off-by: Daniel P. Berrangé \n---\n include/monitor/monitor.h | 2 +-\n migration/migration-hmp-cmds.c | 5 ++++-\n monitor/hmp-cmds.c | 5 ++++-\n monitor/hmp.c | 14 +++++++++-----\n monitor/monitor-internal.h | 1 -\n monitor/monitor.c | 30 +-----------------------------\n 6 files changed, 19 insertions(+), 38 deletions(-)","diff":"diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h\nindex f66e465775..52df053c6d 100644\n--- a/include/monitor/monitor.h\n+++ b/include/monitor/monitor.h\n@@ -34,7 +34,7 @@ int monitor_new(MonitorOptions *opts, bool allow_hmp, Error **errp);\n int monitor_new_opts(QemuOpts *opts, Error **errp);\n void monitor_cleanup(void);\n \n-int monitor_suspend(Monitor *mon);\n+void monitor_suspend(Monitor *mon);\n void monitor_resume(Monitor *mon);\n \n int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);\ndiff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c\nindex 0a193b8f54..e9bb970b20 100644\n--- a/migration/migration-hmp-cmds.c\n+++ b/migration/migration-hmp-cmds.c\n@@ -18,6 +18,7 @@\n #include \"migration/snapshot.h\"\n #include \"monitor/hmp.h\"\n #include \"monitor/monitor.h\"\n+#include \"monitor/monitor-internal.h\"\n #include \"qapi/error.h\"\n #include \"qapi/qapi-commands-migration.h\"\n #include \"qapi/qapi-visit-migration.h\"\n@@ -836,12 +837,14 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)\n \n if (!detach) {\n HMPMigrationStatus *status;\n+ MonitorHMP *hmp = MONITOR_HMP(mon);\n \n- if (monitor_suspend(mon) < 0) {\n+ if (!hmp->rs) {\n monitor_printf(mon, \"terminal does not allow synchronous \"\n \"migration, continuing detached\\n\");\n return;\n }\n+ monitor_suspend(mon);\n \n status = g_malloc0(sizeof(*status));\n status->mon = mon;\ndiff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c\nindex 911d984cbe..a6314c1159 100644\n--- a/monitor/hmp-cmds.c\n+++ b/monitor/hmp-cmds.c\n@@ -90,7 +90,10 @@ void hmp_info_version(Monitor *mon, const QDict *qdict)\n \n void hmp_quit(Monitor *mon, const QDict *qdict)\n {\n- monitor_suspend(mon);\n+ MonitorHMP *hmp = MONITOR_HMP(mon);\n+ if (hmp->rs) {\n+ monitor_suspend(mon);\n+ }\n qmp_quit(NULL);\n }\n \ndiff --git a/monitor/hmp.c b/monitor/hmp.c\nindex 5f9373a87b..387dab2567 100644\n--- a/monitor/hmp.c\n+++ b/monitor/hmp.c\n@@ -1491,13 +1491,16 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size)\n static void monitor_event(void *opaque, QEMUChrEvent event)\n {\n Monitor *mon = opaque;\n+ MonitorHMP *hmp = MONITOR_HMP(mon);\n \n switch (event) {\n case CHR_EVENT_MUX_IN:\n qemu_mutex_lock(&mon->mon_lock);\n if (mon->mux_out) {\n mon->mux_out = 0;\n- monitor_resume(mon);\n+ if (hmp->rs) {\n+ monitor_resume(mon);\n+ }\n }\n qemu_mutex_unlock(&mon->mon_lock);\n break;\n@@ -1510,7 +1513,9 @@ static void monitor_event(void *opaque, QEMUChrEvent event)\n } else {\n monitor_flush_locked(mon);\n }\n- monitor_suspend(mon);\n+ if (hmp->rs) {\n+ monitor_suspend(mon);\n+ }\n mon->mux_out = 1;\n }\n qemu_mutex_unlock(&mon->mon_lock);\n@@ -1521,7 +1526,7 @@ static void monitor_event(void *opaque, QEMUChrEvent event)\n \"information\\n\", QEMU_VERSION);\n qemu_mutex_lock(&mon->mon_lock);\n mon->reset_seen = 1;\n- if (!mon->mux_out) {\n+ if (!mon->mux_out && hmp->rs) {\n /* Suspend-resume forces the prompt to be printed. */\n monitor_suspend(mon);\n monitor_resume(mon);\n@@ -1569,8 +1574,7 @@ void monitor_new_hmp(Chardev *chr, bool use_readline, Error **errp)\n return;\n }\n \n- mon->use_readline = use_readline;\n- if (mon->use_readline) {\n+ if (use_readline) {\n mon->rs = readline_init(monitor_readline_printf,\n monitor_readline_flush,\n mon,\ndiff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h\nindex d40fdde793..7557deb978 100644\n--- a/monitor/monitor-internal.h\n+++ b/monitor/monitor-internal.h\n@@ -133,7 +133,6 @@ struct MonitorHMPClass {\n \n struct MonitorHMP {\n Monitor parent;\n- bool use_readline;\n /*\n * State used only in the thread \"owning\" the monitor.\n * If @use_io_thread, this is @mon_iothread. (This does not actually happen\ndiff --git a/monitor/monitor.c b/monitor/monitor.c\nindex f48603a7e8..3860486a32 100644\n--- a/monitor/monitor.c\n+++ b/monitor/monitor.c\n@@ -130,25 +130,6 @@ Monitor *monitor_set_cur(Coroutine *co, Monitor *mon)\n return old_monitor;\n }\n \n-/**\n- * Is @mon is using readline?\n- * Note: not all HMP monitors use readline, e.g., gdbserver has a\n- * non-interactive HMP monitor, so readline is not used there.\n- */\n-static inline bool monitor_uses_readline(const MonitorHMP *mon)\n-{\n- return mon->use_readline;\n-}\n-\n-static inline bool monitor_is_hmp_non_interactive(const Monitor *mon)\n-{\n- if (!object_dynamic_cast(OBJECT(mon), TYPE_MONITOR_HMP)) {\n- return false;\n- }\n-\n- return !monitor_uses_readline(container_of(mon, MonitorHMP, parent));\n-}\n-\n static gboolean monitor_unblocked(void *do_not_use, GIOCondition cond,\n void *opaque)\n {\n@@ -523,12 +504,8 @@ static gboolean qapi_event_throttle_equal(const void *a, const void *b)\n return TRUE;\n }\n \n-int monitor_suspend(Monitor *mon)\n+void monitor_suspend(Monitor *mon)\n {\n- if (monitor_is_hmp_non_interactive(mon)) {\n- return -ENOTTY;\n- }\n-\n qatomic_inc(&mon->suspend_cnt);\n \n if (mon->use_io_thread) {\n@@ -540,7 +517,6 @@ int monitor_suspend(Monitor *mon)\n }\n \n trace_monitor_suspend(mon, 1);\n- return 0;\n }\n \n static void monitor_accept_input(void *opaque)\n@@ -557,10 +533,6 @@ static void monitor_accept_input(void *opaque)\n \n void monitor_resume(Monitor *mon)\n {\n- if (monitor_is_hmp_non_interactive(mon)) {\n- return;\n- }\n-\n if (qatomic_dec_fetch(&mon->suspend_cnt) == 0) {\n AioContext *ctx;\n \n","prefixes":["16/17"]}