From nobody Sat Apr 11 18:34:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1775837205; cv=none; d=zohomail.com; s=zohoarc; b=KPUD07SMEJx/Qx3SSNQzuHBpojdM41qKd8nSnZTRY+ArLUSDgc/x34HVdpKP7nzgfVkki9WjXt4pzrQkRUEGiIBCpD/kTKnzni2JOxKDnmJVFpGb3oxDPR1as3i2XASCaxo83Qa+PmRAtAusEpOlzWYGnwiR1Sgyg+1JjDRWHI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775837205; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fMbukjWxlkK6SymUOEl2+2+nh1GCzU/KKEQabDiuCTQ=; b=N5YmGmqYDuZ6wpjm9kDODfwCdktbfs82Nhy5WyRJ1Q62ZDSMvev3+in4OBRxI65dsuTP8yQsS1lF3VLJSN2Q+mV3CaC7IYPvi37w/7o0da0XkGGIy5WvwArHICFSL0ZnjW7J0mdRYJuxADH4K+wBLFVe3KfUYJJ4XTh3SW+hbBw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775837205315834.7381594536212; Fri, 10 Apr 2026 09:06:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBEMo-0004CM-Bu; Fri, 10 Apr 2026 12:06:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBEMe-00043w-5d for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wBEMX-0006Rg-Gh for qemu-devel@nongnu.org; Fri, 10 Apr 2026 12:05:42 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-1KYX9G3aOAyKs99N_dtifA-1; Fri, 10 Apr 2026 12:05:35 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E41E195606F; Fri, 10 Apr 2026 16:05:34 +0000 (UTC) Received: from toolbx.redhat.corp (headnet01.pony-001.prod.iad2.dc.redhat.com [10.2.32.101]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E5E1E195608E; Fri, 10 Apr 2026 16:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775837140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fMbukjWxlkK6SymUOEl2+2+nh1GCzU/KKEQabDiuCTQ=; b=SeLjDcSDBToFD6BGOI9fPb3NY0U2wVgR1G5FvlVrqR7/vv+v6RrqCNpiHtLM3oe00Y/D0i rf6BEasQ+lFZjIDUJJbPvmPgOAeBT7GuB1D5TxBW7YUf5mV4lWJtJNPDYLHmcbeH73KixH 629eopicnP5KeLVy2KTZOMZMdPFa5zU= X-MC-Unique: 1KYX9G3aOAyKs99N_dtifA-1 X-Mimecast-MFC-AGG-ID: 1KYX9G3aOAyKs99N_dtifA_1775837134 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Markus Armbruster , Christian Brauner , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Xu , Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Eric Blake Subject: [PATCH 08/17] monitor: use class methods for monitor_qapi_event_emit Date: Fri, 10 Apr 2026 17:04:49 +0100 Message-ID: <20260410160458.3778874-9-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: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1775837208256154100 This removes the need for using monitor_is_qmp() to check the subclass type, which is an anti-pattern. Signed-off-by: Daniel P. Berrang=C3=A9 --- include/monitor/monitor.h | 1 + monitor/monitor-internal.h | 1 + monitor/monitor.c | 15 +++------------ monitor/qmp.c | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index b349b12c34..7b0bda42c4 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -3,6 +3,7 @@ =20 #include "block/block.h" #include "qapi/qapi-types-misc.h" +#include "qapi/qapi-emit-events.h" #include "qemu/readline.h" #include "exec/hwaddr.h" #include "qom/object.h" diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 3f05c46e88..4b5e708f14 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -98,6 +98,7 @@ struct MonitorClass { =20 int (*vprintf)(Monitor *mon, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); + void (*emit_event)(Monitor *mon, QAPIEvent event, QDict *qdict); }; =20 struct Monitor { diff --git a/monitor/monitor.c b/monitor/monitor.c index b51046c0c9..5f55d33476 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -327,22 +327,13 @@ static inline QEMUClockType monitor_get_event_clock(v= oid) static void monitor_qapi_event_emit(QAPIEvent event, QDict *qdict) { Monitor *mon; - MonitorQMP *qmp_mon; =20 trace_monitor_protocol_event_emit(event, qdict); QTAILQ_FOREACH(mon, &mon_list, entry) { - if (!monitor_is_qmp(mon)) { - continue; + MonitorClass *cls =3D MONITOR_GET_CLASS(mon); + if (cls->emit_event) { + cls->emit_event(mon, event, qdict); } - - qmp_mon =3D container_of(mon, MonitorQMP, parent); - { - QEMU_LOCK_GUARD(&mon->mon_lock); - if (qmp_mon->commands =3D=3D &qmp_cap_negotiation_commands) { - continue; - } - } - qmp_send_response(qmp_mon, qdict); } } =20 diff --git a/monitor/qmp.c b/monitor/qmp.c index 0de98b33fe..9c3e8e2678 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -85,14 +85,33 @@ static void monitor_qmp_finalize(Object *obj) g_queue_free(mon->qmp_requests); } =20 +static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict); + static void monitor_qmp_class_init(ObjectClass *cls, const void *data) { + MonitorClass *moncls =3D MONITOR_CLASS(cls); + + moncls->emit_event =3D monitor_qmp_emit_event; } =20 static void monitor_qmp_init(Object *obj) { } =20 +static void monitor_qmp_emit_event(Monitor *mon, QAPIEvent event, QDict *q= dict) +{ + MonitorQMP *qmp =3D MONITOR_QMP(mon); + + WITH_QEMU_LOCK_GUARD(&mon->mon_lock) { + if (qmp->commands =3D=3D &qmp_cap_negotiation_commands) { + return; + } + } + + qmp_send_response(qmp, qdict); +} + + static bool qmp_oob_enabled(MonitorQMP *mon) { return mon->capab[QMP_CAPABILITY_OOB]; --=20 2.53.0