{"id":2222026,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222026/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410160458.3778874-10-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-10-berrange@redhat.com>","date":"2026-04-10T16:04:50","name":"[09/17] monitor: use class methods for monitor_accept_input","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"485eecfe4b1b83b3a9b2a8ba8a00ed2a3b743a78","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-10-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/2222026/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222026/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=Waokd8W3;\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 4fshWw21Blz1yGb\n\tfor ; Sat, 11 Apr 2026 02:07:08 +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 1wBEN4-0004Mx-7s; Fri, 10 Apr 2026 12:06:14 -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 1wBEMh-00049l-U9\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:52 -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 1wBEMe-0006SK-86\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:51 -0400","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-499-ZcLkCasePhKozwq4uqkhvQ-1; Fri,\n 10 Apr 2026 12:05:39 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 5BBB41801310; Fri, 10 Apr 2026 16:05:38 +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 BC186195608E; Fri, 10 Apr 2026 16:05:34 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775837143;\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=7R6JEqdH4/J2K18E2ASY9Ki5eEz6FdgTPGXjd4B2lHs=;\n b=Waokd8W3zPuce2CcXTh1MTvCyv8tlVQsMll9p3XRAtDkQcSaqi6aRtZVOg3cOfbEmH20zW\n uhBs7GKhWHLV/jiiI960/p82wHypzR0+Wa557o5NjD/LREKoHvdCMf2viYTSd3uWecxpKN\n 9BWm/doc34EQtptmnwTe5ps3wMLcgf0=","X-MC-Unique":"ZcLkCasePhKozwq4uqkhvQ-1","X-Mimecast-MFC-AGG-ID":"ZcLkCasePhKozwq4uqkhvQ_1775837138","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 09/17] monitor: use class methods for monitor_accept_input","Date":"Fri, 10 Apr 2026 17:04:50 +0100","Message-ID":"<20260410160458.3778874-10-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":"-25","X-Spam_score":"-2.6","X-Spam_bar":"--","X-Spam_report":"(-2.6 / 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=unavailable 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":"This removes the need for using monitor_is_qmp() to check the\nsubclass type, which is an anti-pattern.\n\nSigned-off-by: Daniel P. Berrangé \n---\n monitor/hmp.c | 16 ++++++++++++++++\n monitor/monitor-internal.h | 1 +\n monitor/monitor.c | 12 +++---------\n 3 files changed, 20 insertions(+), 9 deletions(-)","diff":"diff --git a/monitor/hmp.c b/monitor/hmp.c\nindex 3fe6f5715a..5f9373a87b 100644\n--- a/monitor/hmp.c\n+++ b/monitor/hmp.c\n@@ -52,12 +52,14 @@ static void monitor_hmp_finalize(Object *obj)\n \n int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap)\n G_GNUC_PRINTF(2, 0);\n+static void monitor_hmp_accept_input(Monitor *mon);\n \n static void monitor_hmp_class_init(ObjectClass *cls, const void *data)\n {\n MonitorClass *moncls = MONITOR_CLASS(cls);\n \n moncls->vprintf = monitor_hmp_vprintf;\n+ moncls->accept_input = monitor_hmp_accept_input;\n }\n \n static void monitor_hmp_init(Object *obj)\n@@ -70,6 +72,20 @@ int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap)\n return monitor_puts(mon, buf);\n }\n \n+static void monitor_hmp_accept_input(Monitor *mon)\n+{\n+ qemu_mutex_lock(&mon->mon_lock);\n+ if (mon->reset_seen) {\n+ MonitorHMP *hmp = MONITOR_HMP(mon);\n+ assert(hmp->rs);\n+ readline_restart(hmp->rs);\n+ qemu_mutex_unlock(&mon->mon_lock);\n+ readline_show_prompt(hmp->rs);\n+ } else {\n+ qemu_mutex_unlock(&mon->mon_lock);\n+ }\n+}\n+\n static void monitor_command_cb(void *opaque, const char *cmdline,\n void *readline_opaque)\n {\ndiff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h\nindex 4b5e708f14..7004f5d002 100644\n--- a/monitor/monitor-internal.h\n+++ b/monitor/monitor-internal.h\n@@ -99,6 +99,7 @@ struct MonitorClass {\n int (*vprintf)(Monitor *mon, const char *fmt, va_list ap)\n G_GNUC_PRINTF(2, 0);\n void (*emit_event)(Monitor *mon, QAPIEvent event, QDict *qdict);\n+ void (*accept_input)(Monitor *mon);\n };\n \n struct Monitor {\ndiff --git a/monitor/monitor.c b/monitor/monitor.c\nindex 5f55d33476..1326069b79 100644\n--- a/monitor/monitor.c\n+++ b/monitor/monitor.c\n@@ -557,16 +557,10 @@ int monitor_suspend(Monitor *mon)\n static void monitor_accept_input(void *opaque)\n {\n Monitor *mon = opaque;\n+ MonitorClass *cls = MONITOR_GET_CLASS(mon);\n \n- qemu_mutex_lock(&mon->mon_lock);\n- if (!monitor_is_qmp(mon) && mon->reset_seen) {\n- MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, parent);\n- assert(hmp_mon->rs);\n- readline_restart(hmp_mon->rs);\n- qemu_mutex_unlock(&mon->mon_lock);\n- readline_show_prompt(hmp_mon->rs);\n- } else {\n- qemu_mutex_unlock(&mon->mon_lock);\n+ if (cls->accept_input) {\n+ cls->accept_input(mon);\n }\n \n qemu_chr_fe_accept_input(&mon->chr);\n","prefixes":["09/17"]}