From nobody Sun Sep 28 17:40:12 2025 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=1757527618; cv=none; d=zohomail.com; s=zohoarc; b=LVxoRciXLypkxaB0iP+RjgX6SHOtn7h0jcphT0JBsO9sBjlbqv4Nys0fXe0ZMn5w369zTOVsj/q8W/+t9zwUFc5O4U9HdaYRnaEKQG+HLYQJHP+bxd/PoBXSNO03FUbb4737SMy6vPU1+8vajmumTNxqbCYesWU9w43NS+33FnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757527618; 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=6KBbFO7LRmS7uXQcAahtGaA/mkmtl6dsOkZZBLrYkYc=; b=mMTrrbJrK8fhtHh0omYmGahiUmtS7RPWPHjUIRHfFgZu6tS5BIwiaxRi+ddjdYo7dntR/rIY9BIL9IA1VoJjKwvKmunreRwghscfD05YEowqDkruaLCxFbi9S/iN3oz8Nnqlp59bs13lvaD+6hY74BZHkmhCNDumr9s/1fiBdPU= 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757527618734765.0644019567704; Wed, 10 Sep 2025 11:06:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwPBq-0008LM-S2; Wed, 10 Sep 2025 14:05:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uwPBm-0008I1-PV for qemu-devel@nongnu.org; Wed, 10 Sep 2025 14:05:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uwPBk-0004kn-A9 for qemu-devel@nongnu.org; Wed, 10 Sep 2025 14:05:02 -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-348-gjT0pskJP12qgr_I9j3aRg-1; Wed, 10 Sep 2025 14:04:56 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 C4B041956094; Wed, 10 Sep 2025 18:04:54 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.57]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BF5E61800447; Wed, 10 Sep 2025 18:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757527499; 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=6KBbFO7LRmS7uXQcAahtGaA/mkmtl6dsOkZZBLrYkYc=; b=R5+OGUaLkBSFa/gMpVZqQ3EAmbkqZXTqWfXZywKdJmh1phVIx3e4ndI+CB/lymNOEXi/Gi F3oGUfBLp/+qZO+vLCImsXMKFTXxYZtaqEWB7FGAJF9/HHdyymSqOxw6elTwomwrq3kptX YBXaQmZ0xVP0ZuPISG3dlzyN5i4J3RU= X-MC-Unique: gjT0pskJP12qgr_I9j3aRg-1 X-Mimecast-MFC-AGG-ID: gjT0pskJP12qgr_I9j3aRg_1757527494 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Christian Schoenebeck , Richard Henderson , Manos Pitsidianakis , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Paolo Bonzini , Markus Armbruster , "Dr. David Alan Gilbert" , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v3 12/20] monitor: introduce monitor_cur_hmp() function Date: Wed, 10 Sep 2025 19:03:49 +0100 Message-ID: <20250910180357.320297-13-berrange@redhat.com> In-Reply-To: <20250910180357.320297-1-berrange@redhat.com> References: <20250910180357.320297-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.4.1 on 10.30.177.93 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.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1757527619640116601 A number of callers use monitor_cur() followed by !monitor_cur_is_qmp(). This is undesirable because monitor_cur_is_qmp() will itself call monitor_cur() again, and monitor_cur() must acquire locks and do hash table lookups. Introducing a monitor_cur_hmp() helper will combine the two operations into one reducing cost. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Richard Henderson --- include/monitor/monitor.h | 1 + monitor/monitor.c | 14 ++++++++++++++ stubs/monitor-core.c | 5 +++++ tests/unit/test-util-sockets.c | 1 + 4 files changed, 21 insertions(+) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 296690e1f1..c3b79b960a 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -14,6 +14,7 @@ typedef struct MonitorOptions MonitorOptions; extern QemuOptsList qemu_mon_opts; =20 Monitor *monitor_cur(void); +Monitor *monitor_cur_hmp(void); Monitor *monitor_set_cur(Coroutine *co, Monitor *mon); bool monitor_cur_is_qmp(void); =20 diff --git a/monitor/monitor.c b/monitor/monitor.c index e1e5dbfcbe..cff502c53e 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -84,6 +84,20 @@ Monitor *monitor_cur(void) return mon; } =20 +Monitor *monitor_cur_hmp(void) +{ + Monitor *mon; + + qemu_mutex_lock(&monitor_lock); + mon =3D g_hash_table_lookup(coroutine_mon, qemu_coroutine_self()); + if (mon && monitor_is_qmp(mon)) { + mon =3D NULL; + } + qemu_mutex_unlock(&monitor_lock); + + return mon; +} + /** * Sets a new current monitor and returns the old one. * diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c index b498a0f1af..1e0b11ec29 100644 --- a/stubs/monitor-core.c +++ b/stubs/monitor-core.c @@ -7,6 +7,11 @@ Monitor *monitor_cur(void) return NULL; } =20 +Monitor *monitor_cur_hmp(void) +{ + return NULL; +} + bool monitor_cur_is_qmp(void) { return false; diff --git a/tests/unit/test-util-sockets.c b/tests/unit/test-util-sockets.c index bd48731ea2..d40813c682 100644 --- a/tests/unit/test-util-sockets.c +++ b/tests/unit/test-util-sockets.c @@ -72,6 +72,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname, Erro= r **errp) * otherwise we get duplicate syms at link time. */ Monitor *monitor_cur(void) { return cur_mon; } +Monitor *monitor_cur_hmp(void) { return cur_mon; } bool monitor_cur_is_qmp(void) { return false; } Monitor *monitor_set_cur(Coroutine *co, Monitor *mon) { abort(); } int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) { abort(); } --=20 2.50.1