From nobody Mon Sep 28 00:33:13 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1786445707; cv=none; d=zohomail.com; s=zohoarc; b=l0gJ0WmcnqIkJ4E14z+4C6ai6jPnNiH26bd6vCE84DdS9gDwm1lOHuins/rnm3XOdqeiH4WUs+IQUADHRHwLoeeCHgEJRrSVEu+546LDvVPartp0TZ+a9bnj2Rdu0Op2s3doDin5yKjE69LuRBaA0WC56qsV7PbyAWzSTh0sYRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786445707; 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=yK3vNt1t/PS+GzsEVTsPCWTVujnrwF/VrOO9PtMQReQ=; b=Y9QyAYK5SN8jJSuVabxlitP8fYDrhFKvim36a9puan9k1kv518i6fE9Y1t12WwzXwu1dqQ8ThUnoUZJvPK7KLE+FNnSs6Phw/hLjDPq2j9/+o/jKC83wOsxUywxpZ7AImR+tKvqaKjSLZPhIhabk3iII2QO7O5sftYGrkj+69aU= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178644570789981.08964937307599; Tue, 11 Aug 2026 03:55:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtk83-00087T-1x; Tue, 11 Aug 2026 06:54:43 -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 1wtk80-00085p-PV for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:54:40 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtk7z-00007G-75 for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:54:40 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BALjkj4177502 for ; Tue, 11 Aug 2026 10:54:38 GMT Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fyvcr9f3x-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 10:54:37 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51a8b0a08d2so5661631cf.0 for ; Tue, 11 Aug 2026 03:54:37 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49974146933sm68688195e9.10.2026.08.11.03.54.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 03:54:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= yK3vNt1t/PS+GzsEVTsPCWTVujnrwF/VrOO9PtMQReQ=; b=WMm92utuCQs6vSSS npY9dB02zLwb6WrVaOEjbJVOCeI1HrU1v/lCbXHrXR3v1JtrZX4GlTPugMEKrvdb GInvrcoybnlCphWyE/01wyAJMZHtff1gizjpEuS+oPvD2GJDPpMSRfn5rdBy4vck yTE/aOgtXgfqda1GbkFUvGkM3xuG8rI4JduaiIQ2E0o+ysDTlk9JBKvIL5DC4QFU PKeYs803HpEy947AWnu51ctCqJqbJrz8PVvSF+n0DUt2XrPOXCpLC17wz+zB79fO ysjh3/w7Tw0vyzNVqC1pdqXmvn/gq+Om13RYIIr2Sdn0pwqsMxGiDvRVLeIW7VwT VG5yaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786445677; x=1787050477; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=yK3vNt1t/PS+GzsEVTsPCWTVujnrwF/VrOO9PtMQReQ=; b=ABmEHeQZLy3nKb2Ptqx/NGlUOqbE6f0icxY+RsUMDWqwWkiNnk7nHbJ3JBkviGSkY4 oNrCjRPuUoaFAttnTUJBSy3+4cG7LTaulrz9U+D3vTj2KxU6iHkOXSbSasSjxYaurctQ fQN6qJyHPkKnqAp2/WOOSo+dF6rLCbtmJBONkZVMGzdMKvx3Q/AVN9n/+8QvO9uYhluv GbZnWLINqCxl/jKGdT7P63UVDQL3/L0wcQl1AK/HSOE/7t2RWLiFf3v2LoRgq/lWHMWJ suGxQy8qR06l95aZea9Iu+jwPapTf0iNP0D0VDjVH1+MNFPRWEbQZRzWc0lBLvg56QcQ dAXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786445677; x=1787050477; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=yK3vNt1t/PS+GzsEVTsPCWTVujnrwF/VrOO9PtMQReQ=; b=hp9fD0cYr5IEHiuRUE/p2MhCKa5hLMYD+zCvsDnOFbEPEkWEe4Cdu+hGGZeLE4CTx3 vh9Q0SnhetjB0Uc9Bf4r6yjJYKyqfmlJKwGZgr2nMWKkUrd2+nvuZ/3413D8JcoE+NtQ txskOTYpAnyi3/CWCDUPsbAOXaaWs+f0Ss4ovPYotME2unPbLX09Nx9wvOZFqbT31GuO /jXn50XRR8G8ZlRvqb/coMXM8Vm0owzMAXXyDKYPbNHhmW4in1BmWnX7a0wgFqS48Ft8 utr9fRjuoGa9qhgk3yDj/+2jlEaFblr92nQ6Mx7gYQyh3vodi+KXxCEq1t31veK92rlh ezFQ== X-Gm-Message-State: AOJu0Yw4dpRjT+gouVOE4ZSdb7Tuw5WCu+x1j9nCbqZbWnJ2zbGwoioG LC2XbsyzxjQ0Z7qAnzhLZ9ll4ZUT0R+eIrcKkNHKOTNex0v3ua0kHCdtcxEoacTq7O80jC6yj5L gtU/EhrAC6VjUHniEWCf0vwnvyt353DPtHk+O5/V/DsHbbNvNNmroALvruNG0n1tROQ== X-Gm-Gg: AR+sD12ONgg3VkI1zgo8ashgv0tijtjiPnu0qB+a2b1T6IfNc95JbuF2OP+GfGN0bn5 C+t912k/xhBajp4Usfm6c8AUmVgAWQcdsNz9yTUy4blAueFK4Sw3NsyLsjMMspWqc9jf+yCNE0z h1epVw/kVXYV5Bj7hpeIJkr5hBFrvW4QAxAVBFtjFK+CiE21/ZN4PiXooqIJn9Urv+N9+Jq8xBH Xa1OgiFfPRIDM9EBYRsjoLsec1cwPJJG+6DGFcHvT7dxo8c8UdzyltZRC0MGrfMmI0vDlfbXAsX KG4bKv2P7Qiu72AY9S0xUK6AWzlStjk0Shx77szFYutLgv8jeqsWWWeREGo/1HyObaSip5euULc M/QWobZw6lY0Gcb9MIatWZXGukhBDA95Cu38BGJK/qM4focA= X-Received: by 2002:ac8:5d16:0:b0:51c:22c5:daee with SMTP id d75a77b69052e-52d5864d5d4mr16457871cf.29.1786445676939; Tue, 11 Aug 2026 03:54:36 -0700 (PDT) X-Received: by 2002:ac8:5d16:0:b0:51c:22c5:daee with SMTP id d75a77b69052e-52d5864d5d4mr16457471cf.29.1786445676372; Tue, 11 Aug 2026 03:54:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" , Thomas Huth , qemu-ppc@nongnu.org, Corey Minyard , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/7] hw/nmi: Use object_child_foreach_recursive() in nmi_children() Date: Tue, 11 Aug 2026 12:54:19 +0200 Message-ID: <20260811105425.7429-2-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260811105425.7429-1-philmd@oss.qualcomm.com> References: <20260811105425.7429-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX0lyASTwkeBjq kVeYDKi0a+Fq8+8FLZ6Gp8m38YukWJgXGhJXsqpdWkU2tezM7gSA4JbGjQaY4ogvFjmmm6jDdi0 aXcOCUKpTLGALvH+pAAPi4wJomrs0CAuIn9Phs1gkjWvmTnCN41xT4Aed5OiiuDlvgQQEGbsdfC Rd9xAVLJWTm/7Rqs4FEOtf/hk51nOj+w6p5BdsBAL8Wg+8XvX9qxyJ2176Tt3RlESO/oMLwRWVD oRxrenORdPsiUhUfL4PRJZGImIv2QQS5tmUYGka5J5bsV6RtpADE5/1uA5AnZRIxk0wNUFGxMDn R9dJP4Lfy0kHELplyzxdIhf1ttPt6Fpk0H3VZj28FZeWkciZXRjNJkDKIrs59vOhWs7MeLOnkAq w8g+ILLHUacVqnDp8bEPRK4Xd1KMdjQ9ylDS16oFs0ZfcawDPVkUyGrarmh5lAgTGJVia8wSXGi Wkl30KOZ8D+bWFmnvcw== X-Authority-Analysis: v=2.4 cv=e/A2j6p/ c=1 sm=1 tr=0 ts=6a7aff6d cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=jmNSRpmTyL3U9imlh2kA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: Sy40deXzm4ho5TpyIC-6n3jVd1sXWgvd X-Proofpoint-ORIG-GUID: Sy40deXzm4ho5TpyIC-6n3jVd1sXWgvd X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX4BSRW5wS0ZfP rYOvPSf7nAr9vprw9zgEBdfpUN3QB1AEIM3JAZwNJEHkQvqB3TNgxi143te1LlAYsfyvq6Zugvm ISM/3OF0HM/jOUypVpkLgMgGGvTxSUM= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_01,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 phishscore=0 spamscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110090 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1786445709016158500 From: Philippe Mathieu-Daud=C3=A9 Replace object_child_foreach() and recursion by a single object_child_foreach_recursive() call. Propagate the returned value so callers can check it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/nmi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/core/nmi.c b/hw/core/nmi.c index 4b447e126ba..22724046575 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -31,8 +31,6 @@ struct do_nmi_s { bool handled; }; =20 -static void nmi_children(Object *o, struct do_nmi_s *ns); - static int do_nmi(Object *o, void *opaque) { struct do_nmi_s *ns =3D opaque; @@ -47,14 +45,13 @@ static int do_nmi(Object *o, void *opaque) return -1; } } - nmi_children(o, ns); =20 return 0; } =20 -static void nmi_children(Object *o, struct do_nmi_s *ns) +static int nmi_children(Object *o, struct do_nmi_s *ns) { - object_child_foreach(o, do_nmi, ns); + return object_child_foreach_recursive(o, do_nmi, ns); } =20 void nmi_monitor_handle(int cpu_index, Error **errp) @@ -65,10 +62,9 @@ void nmi_monitor_handle(int cpu_index, Error **errp) .handled =3D false }; =20 - nmi_children(object_get_root(), &ns); - if (ns.handled) { + if (nmi_children(object_get_root(), &ns)) { error_propagate(errp, ns.err); - } else { + } else if (!ns.handled) { error_setg(errp, "machine does not provide NMIs"); } } --=20 2.53.0 From nobody Mon Sep 28 00:33:13 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1786445708; cv=none; d=zohomail.com; s=zohoarc; b=ead2UdveToRI31o3IDokmamz3SdjT9TAT3BHTRGSUbfnnVaOFYtFIxd+ySYNlyCEGZ9rqxuGvFKnSab+9Htr9i1OvMJ11cOHSvW3nLnCFA/ebVAtr8W6qHIysHdFRWo2q9ETHuDmY3AFJMi+wD+UfAz7DnhAVbxymllXwgJO9X0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786445708; 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=0ooFzW+Lv9lCiVhFwqR4/0Q/n2XWyHN2y+PA3RDrHc4=; b=WRegx7d9r/tVt5BbuJGTKQcaMmZU2KbexTCTJumVXKog8ZUoXUPFPjEXymqB6zJjIBKePRkhdVPYk7wKQFAz1+AE/VJtM3RIuNvXMNozBcZw8SPt6IDNlHVasAeQnFYpYqSXofIXThtcLKrLOcMXO9+ImKqcvFAKIrW+tSZBBxA= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786445708004843.732512693468; Tue, 11 Aug 2026 03:55:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtk89-0008Ff-EJ; Tue, 11 Aug 2026 06:54:49 -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 1wtk87-0008E8-VC for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:54:47 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtk86-00008I-DE for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:54:47 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BALhFT341090 for ; Tue, 11 Aug 2026 10:54:45 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g01q104ss-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 10:54:45 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c07f25de2so3244761cf.3 for ; Tue, 11 Aug 2026 03:54:45 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49974146b83sm57807885e9.11.2026.08.11.03.54.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 03:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 0ooFzW+Lv9lCiVhFwqR4/0Q/n2XWyHN2y+PA3RDrHc4=; b=ksU+8xIrlW3NeCfD uhCycczPvuaMDn04fPPcJf7M/k7579PtrzMA0tD/b3Z4yEm2sm78rcxhxbUsMIQF KMweGxAsTC6LYbiBy9knhSRWYK3GIFyYFqrtwB5Pdg7d3GL0FSitZBew/A6V7UPo Sg60P4ZxM4vbTpbJK3+TyIJvenrWQW2noxlydSrH+8vqhaWV7A7o23PbEcMAzjww tCbRbMCq0uwU+vY+7fNcCTPGkALL+ympO9fJ0vvwN8YaLLBC+fJZlsHpEUwi4Cza bGDq6n7EAkPIqpFq6+iGnuiMyvHBXm7CWmnRNF4ChrfkEjO54D8y4B98SCelmT2r qe4EFw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786445685; x=1787050485; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=0ooFzW+Lv9lCiVhFwqR4/0Q/n2XWyHN2y+PA3RDrHc4=; b=Zh+ZNB2LbCw+gDURXxpVnYYp8YQf92qNrnsDoPpyjA/AQ+RYf5F56aMoZLZ7e4UXNT 22ms1CVoCIaD94vCXlrCBDn51zk8ZiZCikcOdKTsXx6SR0UXksFUIMyFeY0YFEIdytRd gQC3+2ahgkcLH0vhKOSByk+bBeVRs/RDA9da2sGxADc7403ltYa8UEmAyEfJ5gde63ME IHqjZg9iZO/L+T15gwnvrPgb5aOt2sPq4OVC4FEjfMnQaMWWk1NlGe+uhhAp4fBBCOF2 tQwsGozVnb3v5b06+QL0sofUBatbbHRc7vpzUDJ+W3aPURP61yY7t8k3nSt/XEAK3pPe iYSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786445685; x=1787050485; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=0ooFzW+Lv9lCiVhFwqR4/0Q/n2XWyHN2y+PA3RDrHc4=; b=ZfhT7pT2hDLdeVIvWnQo0KU7N2MFudpEuo4sfOdHJpJCZWhbYzp0cE3PNkEwmPceTL NI5LJvaqPadqRg2wEU2FYL3SoxnwRFpL8aFOCaKfFBvGU7bmAnSjkztThdP+HMh9hbf0 eZzyURoj/stRTRPTsxhvW6Drw+ftA6iRz/uVa2FfeTFc9euBvDVrqmlvNqsYQmei4cvy ApLHVAdYU1b49VSI3QFOQSe1t4vxLaioFw54TrCcotqULFHtpwo51WF4FasJnBRitRg/ uJI1u6K3x9ksKeNk02Z2GPXZomj1p2lzFkZgqifm9wkjzd6dtoh0fK+VWotTeKjEeZL4 uXWg== X-Gm-Message-State: AOJu0YweFmyCUxUl6ERWpuCCEio2VAHWJBXBOcW3zpQ0ifXezN428HZE bcar/glfvG/766wJor7W3qws1cNfm7CO9T+7MPv9VmPXZCDMwO7TyiNe0aQs33ArUwAi8jx2tjU mmUXVsmns/vn3Ijh/RH9KZ2+Hp0vcJKhZ6ASyFUbq2sXfoTbLV4fjFC1iCCac60D2wA== X-Gm-Gg: AR+sD11I0am7v77KRinFXtNTgdk5UKZKsvG2Z932oDVcjcsXkZLYLvZYA7gN5PGNHmK YFrKQVjTUByNCUPAHH2NtS/oyuTYxYyZbBkB8KRh9jr/4rHx1rFtAQ3gphTjM+bzdhEd1UayajS 4yj3/ycog9OU5DXUnKMJrUAu5X5Kx/kz31xr9gRzXjoM9+asEOemDfHGoY5VoNVlTntFcCe115J ilVXgtm2W/WbBFFc8AE3xnKdTAnmVYYMjEAGS6jx5WsCe4vp3r0Vghmt2KrZnlF3o/U+4GgsSOV 49fj/VDUZsY8au80U626ym0mklTsVyRAHQpuGZoWzdbrmUsqd9es/xurMsO9s0zodNNi31uBO1B SXm/w2Fj9wQz8TQSCoZ2cde9QljOJWkwRryN/+GkMtoUzu9g= X-Received: by 2002:a05:622a:1314:b0:51c:844f:28da with SMTP id d75a77b69052e-52d584a6d54mr14264431cf.5.1786445684555; Tue, 11 Aug 2026 03:54:44 -0700 (PDT) X-Received: by 2002:a05:622a:1314:b0:51c:844f:28da with SMTP id d75a77b69052e-52d584a6d54mr14264111cf.5.1786445684087; Tue, 11 Aug 2026 03:54:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" , Thomas Huth , qemu-ppc@nongnu.org, Corey Minyard , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Eric Farman , Matthew Rosato , Halil Pasic , Christian Borntraeger , Richard Henderson , Ilya Leoshkevich , David Hildenbrand , Eric Blake , Paolo Bonzini Subject: [PATCH v3 2/7] hw/s390x/virtio-ccw: Always deliver NMI to first CPU Date: Tue, 11 Aug 2026 12:54:20 +0200 Message-ID: <20260811105425.7429-3-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260811105425.7429-1-philmd@oss.qualcomm.com> References: <20260811105425.7429-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: cpQnHejahy_rcLEOQ3vaKPJNYytbyv37 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX2BKMqdAz5fBP I82rgY4BfzbwaLqJ3GKIXYmxDS3P7etnK9ubUto2lFaQKFT7EW88rTGlNNpm5SqzUukyMpOKlfS wqNiIwxhTtMUWDuEuV6Rdq/PQFv5tFdWMGTAKv2oI/zGmZVc4caLUFD0utU9UecmNqIMDnE0XCt Sbkb/mfUVcCYjBUJF4+ViUfschzh1wW0clnAcYUytxPlQIPadonFFifrUEez02BwaBTiqwcMm5p x0Ws4QbbA4ybZuoi8FYKxt0SKC0YAJ1uQ/O6GHLMHAn9bBmAUGWZ3BIdCStWd/XzUaCLwf4OOCc ftmupUOjZd0l6Hea3ec+G1XOJP9TCKB2OvhYdNGpszta9Dj/W1vY/4mPGCrtOB2YC2RMF7oN3nG SAQDpiW/qaOBFu2fI1qW5VLww6jAzfCA+xe6rgJJXQzPl7mg0lsuUDc+fFO16Y/QD/vrR6vNtcF j7MA22ngouCDFm8TVzw== X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX4htn8FnkNtOo YKRISGJsMuHDD+5boJqVn1iLvOwwms1SkhRqPbJLUgQX+NOU+IKtPrSe6rwDhsou0GtB1bOwyaA 7M3wTr6nZmO/AdvFNsa0HxnAZOKrJV4= X-Proofpoint-ORIG-GUID: cpQnHejahy_rcLEOQ3vaKPJNYytbyv37 X-Authority-Analysis: v=2.4 cv=brt8wkai c=1 sm=1 tr=0 ts=6a7aff75 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=KKAkSRfTAAAA:8 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8 a=ON7NdJYOkfl7qig6nyMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_01,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 adultscore=0 clxscore=1015 suspectscore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110090 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=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: 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 @qualcomm.com) X-ZM-MESSAGEID: 1786445710546158500 From: Philippe Mathieu-Daud=C3=A9 We can trigger NMI from HMP or QMP. QEMU maps the NMI to the s390x per-CPU 'RESTART' interrupt. Linux guests usually setup this interrupt to trigger kdump or crash. Such crashdump can be triggered in QEMU by HMP "nmi" or QMP "inject-nmi" commands. Using QMP, since we can not select a particular CPU, the first CPU is used (CPU#0). See the documentation from commit 795dc6e4 ("watchdog: Add new Virtual Watchdog action INJECT-NMI"): @inject-nmi: a non-maskable interrupt is injected into the first VCPU (all VCPUS on x86) (since 2.4) While we can select a particular CPU on HMP, the guest behavior is expected to be the same if using CPU #N or CPU #0. Since always using CPU#0 simplifies API maintainance, update s390_nmi() to deliver NMI to the first CPU. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: David Hildenbrand Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- qapi/run-state.json | 6 ++++-- hw/s390x/s390-virtio-ccw.c | 4 +--- hmp-commands.hx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qapi/run-state.json b/qapi/run-state.json index a5771ad4681..e4fdead1e0b 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -317,8 +317,10 @@ # # @none: nothing is done # -# @inject-nmi: a non-maskable interrupt is injected into the first -# VCPU (all VCPUS on x86) (since 2.4) +# @inject-nmi: a non-maskable interrupt is injected (machine +# specific: for example on s390x CCW only the first vCPU +# receives the NMI, but on x86 machines all vCPUs receive +# it). (since 2.4) # # Since: 2.1 ## diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 25a9fa49554..4f7861dbbb7 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -727,9 +727,7 @@ static HotplugHandler *s390_get_hotplug_handler(Machine= State *machine, =20 static void s390_nmi(NMIState *n, int cpu_index, Error **errp) { - CPUState *cs =3D qemu_get_cpu(cpu_index); - - s390_cpu_restart(S390_CPU(cs)); + s390_cpu_restart(S390_CPU(first_cpu)); } =20 static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp) diff --git a/hmp-commands.hx b/hmp-commands.hx index 7ae2468a3d9..3aa159f11ce 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -870,7 +870,7 @@ ERST }, SRST ``nmi`` *cpu* - Inject an NMI on the default CPU (x86/s390) or all CPUs (ppc64). + Inject an NMI. ERST =20 { --=20 2.53.0 From nobody Mon Sep 28 00:33:13 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1786445793; cv=none; d=zohomail.com; s=zohoarc; b=cuQHdNz8O/32HXtQN4eKcNtca+KOjI58JmgVJ1ZZZAnz+0+dydWID9PcG/UWe6Phg3Ro1K8iO1Wq2AgWPGIwSbx+AvgwJ4JsKATqdVw1m/NArk0jbQ6aJNsRmGYl/5XaZDWif2UVkFYAgQYSH8FN/YYi2m4DL7QYXFNAGi7DMng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786445793; 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=XgdgW8FHpQY7YzIFnfakjsIyt0J+i7IP25N5DI75/PE=; b=izzGY8+2MlsCko3fxiOcS+aK+rdFivO1Lx6DXnMEpufyESm/YqI+KSUg2KxbuELFXh73AxOfU5Pqt2ocsKvW4i7FFt2sIh0D+/2zJE23c8T1pcGSgZ/lPuOo8RcP6CwKLnhxm2KcajdSwgy6USNy8j0F5L5gj9qlcqm2kUk6Mbk= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786445793719427.581905591103; Tue, 11 Aug 2026 03:56:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtk8O-0008LB-Ev; Tue, 11 Aug 2026 06:55:04 -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 1wtk8M-0008JN-UR for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:02 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtk8K-00008q-20 for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:02 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BALVb0338595 for ; Tue, 11 Aug 2026 10:54:53 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g01nc05bg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 10:54:52 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-52769fc3f2eso37818271cf.0 for ; Tue, 11 Aug 2026 03:54:52 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4814a5ac691sm3705229f8f.3.2026.08.11.03.54.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 03:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= XgdgW8FHpQY7YzIFnfakjsIyt0J+i7IP25N5DI75/PE=; b=H0JL+lgs6MhQ1tQN Pp307qtcLPVuluhvTosceEtzMvvnt9VkXmxERWWjdeffFWDyT55EmSSrcB0uYwY6 PC0wLhVBSuVWahbxMj3oG874B88eO8gSsEfajpFVN4zDONhoWVsUOHPRPFVpHYHF PxOxPt8nokfrnBxcqq4DGkusvAGYoJeI7zKvNemlQ/lh5nN74/IEiW9ZBAQe7g5Y verJ6g8r3bYVI5qjEzNl2j6frkc+wzqVBKyfnNS6YUqIivO5HlbmV8v5Vw6MiPGk gbOnAxv3aeqX93hhHTSAb7T5NSCaY5IoXMOxjpPQWrdeSBMsmeTR+gE6loRQ8Ibw YMySYg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786445692; x=1787050492; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=XgdgW8FHpQY7YzIFnfakjsIyt0J+i7IP25N5DI75/PE=; b=WCBczY7DU+Rew8aUsK4lKkc79SJHenkuzacNo+WkrLmXOkQ04Wx1+T6pOUO+JfhYwb W99rCX9Yq3XaUCoYFZbLN2Ulyl2oGDbP33tsQ0iUjFRyDb1e34mKuUpXtY8Qs+sl5b1V j3lRBE1hQQqvN0AgdQbI006/7MGHEeiPDHV4DgtUsqnSgVocEPpjCdjyrEpuNHoDqqQn +2wxTYlt6YguHuTq2vJgUdcYlZAKGUtbEMqJi/CtbOMQuVWO9hSZbnBTSdhbrTVBlsrw 50QPD576drSW9QD4bliSKRWBJvtGjISK9sXo/fiHRwTIQwown08+K04vNJPEj0u1VSgU aMlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786445692; x=1787050492; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XgdgW8FHpQY7YzIFnfakjsIyt0J+i7IP25N5DI75/PE=; b=PMJYP6fZCLtlB/M0AgYMxWz7QSajTTWx00nbhRMeBsPQNbODIaFKl/zGfKk/HWGzN/ gIuBhAdQXAVD6Vp0XI5Y2YtH1x5eF8+9IZ2jYjMkZV8avb82vSg8EIAMVVitl6IZw7c5 sW8d7N13l6s+87QfyPpbUWaSmMoGpsy53j7BlM9T1Cis1i+pkOiBtnr1Udzwj0pi1csv qAS+8ik0bgIj4yD/9Z7fIhKgJHuaxHij8ar7k6wnyRd5zeEZqryzcbB9zUUfs0U2O9ta JPKtObmSeKYA223ejR9UwaijduMMb2UAp0e4V5vcnyJKJOBQnBh7G3kY8KpolrNEewW4 2tBA== X-Gm-Message-State: AOJu0YxHLWr4+Nca7yGNreCRGMiTugnplBafX7jRaida0y6ZtEcUuCMV Jp6keqdRc8pz1+33iImE8xn45c3PoHFTvFhld+HTKd39eUPWnckASDpN+dNLTBjypJsdSvXTU5a CmMpIZqi4OpbEhUi+VUyh2JsU4uYe7AIkID58i0NxiQTxxQVvDuPaTZFLHv2h3ts4GQ== X-Gm-Gg: AR+sD13e4Z5BoVvnyg2arkBJKbMmq6DdMAFpCx5F5csWf2XPLbC5cE2+sy9/brn2YW6 ZF66uGHdpTxha5di4b6LBTvqA8T54HqbfOqa/M01nHeU4Vx+bJrL4Bdxyzs1b2UzRgt4+hIXKm9 liytIfP221ynPmBAQsb8St5yC3yWGdqFrEIcZuwJKJqds6ew/Q8Mp9MZDv9Yd6VhVfbxw408qAr B+7595yvsmFuVhIq4qr1OFuwe0W3PmvX4vK2Gcz8hDfnYO2zHw4CdJF3YKFFmGRLe7lN7QsrmCs 4NsDoDVews7YgzgXa3az7CtZNdDy9aj5ZkCMR1b5ZFI1bzv/+pC0eA2iqY5MOxuNrWVyjG52eW2 +AMv8X4xti4temo9Ai0BDDpB0rbr3cCPTnWJkvnUjpqVyMdQ= X-Received: by 2002:a05:622a:4d0a:b0:52c:cc14:ff5f with SMTP id d75a77b69052e-52d5869539amr18874711cf.38.1786445692347; Tue, 11 Aug 2026 03:54:52 -0700 (PDT) X-Received: by 2002:a05:622a:4d0a:b0:52c:cc14:ff5f with SMTP id d75a77b69052e-52d5869539amr18874261cf.38.1786445691889; Tue, 11 Aug 2026 03:54:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" , Thomas Huth , qemu-ppc@nongnu.org, Corey Minyard , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Helge Deller , Paolo Bonzini , "Michael S. Tsirkin" , Laurent Vivier , Mark Cave-Ayland , Nicholas Piggin , Aditya Gupta , Glenn Miles , Harsh Prateek Bora , Ilya Leoshkevich , David Hildenbrand , Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , Cornelia Huck Subject: [PATCH v3 3/7] hw/nmi: Remove @cpu_index argument from NMIClass::nmi_monitor_handler() Date: Tue, 11 Aug 2026 12:54:21 +0200 Message-ID: <20260811105425.7429-4-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260811105425.7429-1-philmd@oss.qualcomm.com> References: <20260811105425.7429-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX5n1oBufJVF5E Po67A6OsWPYBgRQZov2koDo+2MqDpPDXwb08yXpqo5T82BSzihcUbognuX7B+clqQ7vSjsGgTRn q3XdI/PjnIhF5K1hofh99q3TYx9VGA0= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfXwFD849mrm8qp VTboY7MhgfkiLr0jG36me58btvRnsEEU+7htzFBWAR/bbW2J6YE5q1CzHnLcA8N4eKs/wso2l8R dL18RDavUevKZVmJjlr27Q2w6u3bX1+tE9wXYxpAXauzeFUxa42Tzraw0aR4n38fooVcqzyx/Cv 3LCTO0j/lKjOZLHJPWY2eK0gyNcobkStuMs/kpnKbH95YQnAK5rzO/O9/gXEltHZx+0sLKbxBSC axTO/Z4ddCY24tkJdjIwY6qFSZ99Te69cBOvNYUVWM0Ps87LWNIiieQONtOyObURjerCdDgZ6Ny vg3qAsHRxBS8YYWIaE5PMvftTSFKJ7Q/ZyJpVwO8JaVEp0iNr8swI/hzc4fCeVMbLzqvyMFZ/li HQ7O0Gk9k7kV6zlItjGrHCqM59jADfY7cDw71xs6GqVxD5qt3MU4VXlmJPYdtRrtNHY6hTDCvmx AY/uCPIBHgW6D9wMa6w== X-Authority-Analysis: v=2.4 cv=RY6gzVtv c=1 sm=1 tr=0 ts=6a7aff7c cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=KpD7k0r93PjNlcRUnYkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: D-IdwFgsNk1-Id6Gn8Loy5m6zYKsAXbY X-Proofpoint-GUID: D-IdwFgsNk1-Id6Gn8Loy5m6zYKsAXbY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_01,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 adultscore=0 suspectscore=0 spamscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110090 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, 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: , 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 @qualcomm.com) X-ZM-MESSAGEID: 1786445794810158500 From: Philippe Mathieu-Daud=C3=A9 Only s390x was using the 'cpu_index' argument, but since the previous commit it isn't anymore (it use the first cpu). Since this argument is now completely unused, remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- include/hw/core/nmi.h | 8 +++++++- hw/core/nmi.c | 2 +- hw/hppa/machine.c | 2 +- hw/i386/x86.c | 2 +- hw/intc/m68k_irqc.c | 2 +- hw/m68k/q800-glue.c | 2 +- hw/misc/macio/gpio.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/hw/core/nmi.h b/include/hw/core/nmi.h index fff41bebc69..4c4ce79071d 100644 --- a/include/hw/core/nmi.h +++ b/include/hw/core/nmi.h @@ -37,7 +37,13 @@ typedef struct NMIState NMIState; struct NMIClass { InterfaceClass parent_class; =20 - void (*nmi_monitor_handler)(NMIState *n, int cpu_index, Error **errp); + /** + * nmi_monitor_handler: Callback to handle NMI notifications. + * + * @ns: Class #NMIState state + * @errp: pointer to error object + */ + void (*nmi_monitor_handler)(NMIState *ns, Error **errp); }; =20 void nmi_monitor_handle(int cpu_index, Error **errp); diff --git a/hw/core/nmi.c b/hw/core/nmi.c index 22724046575..ff6454437c1 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -40,7 +40,7 @@ static int do_nmi(Object *o, void *opaque) NMIClass *nc =3D NMI_GET_CLASS(n); =20 ns->handled =3D true; - nc->nmi_monitor_handler(n, ns->cpu_index, &ns->err); + nc->nmi_monitor_handler(n, &ns->err); if (ns->err) { return -1; } diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index d762163ddf5..2b44debc388 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -829,7 +829,7 @@ static void hppa_machine_reset(MachineState *ms, ResetT= ype type) cpu[0]->env.cmdline_or_bootorder =3D 'c'; } =20 -static void hppa_nmi(NMIState *n, int cpu_index, Error **errp) +static void hppa_nmi(NMIState *ns, Error **errp) { CPUState *cs; =20 diff --git a/hw/i386/x86.c b/hw/i386/x86.c index dc7f0d56b01..0ea5453403d 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -147,7 +147,7 @@ static const CPUArchIdList *x86_possible_cpu_arch_ids(M= achineState *ms) return ms->possible_cpus; } =20 -static void x86_nmi(NMIState *n, int cpu_index, Error **errp) +static void x86_nmi(NMIState *ns, Error **errp) { /* cpu index isn't used */ CPUState *cs; diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index 68ddb5351be..bc41b44d455 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -70,7 +70,7 @@ static void m68k_irqc_instance_init(Object *obj) qdev_init_gpio_in(DEVICE(obj), m68k_set_irq, M68K_IRQC_LEVEL_NUM); } =20 -static void m68k_nmi(NMIState *n, int cpu_index, Error **errp) +static void m68k_nmi(NMIState *n, Error **errp) { m68k_set_irq(n, M68K_IRQC_LEVEL_7, 1); } diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index ac9062c6488..b13e5ef95f1 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -159,7 +159,7 @@ static void glue_auxmode_set_irq(void *opaque, int irq,= int level) s->auxmode =3D level; } =20 -static void glue_nmi(NMIState *n, int cpu_index, Error **errp) +static void glue_nmi(NMIState *n, Error **errp) { GLUEState *s =3D GLUE(n); =20 diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 1a7c534d652..1bdca728f97 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -188,7 +188,7 @@ static void macio_gpio_reset(DeviceState *dev) macio_set_gpio(s, 1, true); } =20 -static void macio_gpio_nmi(NMIState *n, int cpu_index, Error **errp) +static void macio_gpio_nmi(NMIState *n, Error **errp) { macio_set_gpio(MACIO_GPIO(n), 9, true); macio_set_gpio(MACIO_GPIO(n), 9, false); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index c0cb45dbfbc..8676be7bbb1 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -3552,7 +3552,7 @@ static void pnv_cpu_do_nmi(PnvChip *chip, PowerPCCPU = *cpu, void *opaque) async_run_on_cpu(CPU(cpu), pnv_cpu_do_nmi_on_cpu, RUN_ON_CPU_HOST_INT(= 0)); } =20 -static void pnv_nmi(NMIState *n, int cpu_index, Error **errp) +static void pnv_nmi(NMIState *ns, Error **errp) { PnvMachineState *pnv =3D PNV_MACHINE(qdev_get_machine()); int i; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b79828b4e90..189334b9f0a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3550,7 +3550,7 @@ void spapr_do_system_reset_on_cpu(CPUState *cs, run_o= n_cpu_data arg) } } =20 -static void spapr_nmi(NMIState *n, int cpu_index, Error **errp) +static void spapr_nmi(NMIState *ns, Error **errp) { CPUState *cs; =20 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4f7861dbbb7..5d8a73a63df 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -725,7 +725,7 @@ static HotplugHandler *s390_get_hotplug_handler(Machine= State *machine, return NULL; } =20 -static void s390_nmi(NMIState *n, int cpu_index, Error **errp) +static void s390_nmi(NMIState *ns, Error **errp) { s390_cpu_restart(S390_CPU(first_cpu)); } --=20 2.53.0 From nobody Mon Sep 28 00:33:13 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1786445780; cv=none; d=zohomail.com; s=zohoarc; b=kbbS4gNbVRFXev/5Pz3HhBFWN8epW6mgyfrTolpxvsrjfaZvKTaSYpLQEQ+YLj4FYSm/Mt8cb9gsZ1fyCC8cWr/8bWdfnxmJnadFU+1eASCg5WfjY4ygQfky2luRcOzW5vUysy8J/3HJISU1O4zZG7AiC3fN4Wur5dQfjFtt8ds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786445780; 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=45O5ZPkXnN4lR6w4tP5RI9h0AD+uvfX9nj+VXuvU+5c=; b=B0wpDWsszggyAdAyQ9pr1WWDa5EFQ/ONMcX3NaacJIH409QxWU8obmqeB1ybWg6VfHzSCz39vFJRhkPd1JpRr1DzOnH/g5V4a4oBA8NvHMZ9iilTvFvxO5qIrkKgmXR/tQWP5lmBdiyNrJhdd4TVv+mtRSxHBI3z5sW4UzuSUuM= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786445780901440.0957240940402; Tue, 11 Aug 2026 03:56:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtk8P-0008Ll-3o; Tue, 11 Aug 2026 06:55:05 -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 1wtk8N-0008Jm-DU for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:03 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtk8L-00009H-GX for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:03 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BAMYHc037442 for ; Tue, 11 Aug 2026 10:55:00 GMT Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fyjk63q8f-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 10:55:00 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-52827090cc5so11366951cf.0 for ; Tue, 11 Aug 2026 03:55:00 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4814a7096c5sm3646022f8f.24.2026.08.11.03.54.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 03:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 45O5ZPkXnN4lR6w4tP5RI9h0AD+uvfX9nj+VXuvU+5c=; b=S19YzL3zy1XujhE0 Uud+lE/81M3SUk526XQLiqkoj39BJIaaU3adnvd5zDI8Ui6yP0GuhY0avM9pTYC7 wiZgDDgP1a1s6IjiyIi/FDoqOM6bClhe30NhwKGDH14cMHllUxAE9FCRXHOVlDh1 OE+DBib9115FpXZsjRzq7o4jTh2vqh7GA7Pq8yWAwnBtPVEcs08lp/c7k75tHYLD WSWUAMwIKiRpBURjCebwmFOJsDPt66AqzxhdQQALMsZhRC5z4stUXilz5l2tnvd1 2eylVV6XXXOyZSMX6gtOl0WXIoeCXCsq0l9T84+U5HXviTAQMnBsRnq7MNTuK8h4 QSpRvg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786445700; x=1787050500; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=45O5ZPkXnN4lR6w4tP5RI9h0AD+uvfX9nj+VXuvU+5c=; b=dpgkuDjKj3+VsC4+Klt2qswyaWhHdyKSK6v7vAzCzMW6TrBQgHSBg8uYJgRbk989+m aallTHyK48HDTxcQqZavglkcDiXCBptrTbbtVGpukjpWB4oSmrqvQhNy0bmZ1DwVsym+ vij53fdY0pIbEBj+6kYRnwBSK0l/qKe2xQUVe0TWvlRa7B622ZoV2akqcaDykBysubyw I1FvK+Yy/9ESfF1UpAOafYOI8xilqAYvznAo2VupUD+cK3hg8P8QgviVjjZPERbT/PB0 yUdIcwGr7RN+hpY2q6LYWoIqReR6xgdVU9MjLlZzH9svai9vkyzgf72s6RyJ1PAqh1RA MUJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786445700; x=1787050500; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=45O5ZPkXnN4lR6w4tP5RI9h0AD+uvfX9nj+VXuvU+5c=; b=CcrJPixrq66VQ6NF9KhuAi1RHrLYMGbV4Zc9rIxzcgGllDbZCV4F7pCYtrQrR/9xT5 1GyvHi9FYFb/T5JFAgn40FYt4pbtHLsyW35778kG56693da+u9Kmod6aOy5WgH3fjAU2 I0rNURB57OYpGGNbAhWgRGtLuVdHrC2vey/N4VmKPrDf03/lDmi+t+1r2UvgQ6ltehtY ceH+VRD/vtxXGiAoMh/WkkkDfR7510CSr4j7CvHDGvfr2updbBHd3S3JU8Z3u98N8gWC 9bO2aNam0AkR4MGsySTMtmCnzDqCAlLDoBFSxrtcdXU2dyVm+/G8mSEM7Fq30AWE6Kmp DB1g== X-Gm-Message-State: AOJu0YyAZcGF+JMgsEa5kEXfS0yWd8nQm8xiBExRGxozgJaKiZvdTdqe KDfgC0sgaoLCliXdrktdoeiBybL6KudwxCZMETPaEqAkgAsZV0ZxRJeulwCqP79kov18COO/J6F CwYlG9YybIaoxCZicl/JOYXJAOI3bNDMwI4K6+UfEs6dAzyP4TP7r8RFPgHADIzlpig== X-Gm-Gg: AR+sD12n8nXvW/z8HZ66FTg1EuKiVGM2aggbuox3GKAShjnwR4KdDFXDffS1adbbKs5 Q8R2W88eB4v6wTC5T6b7PfEfIBdC8uvGJ+kajgPeO0tbaG2QglbVTW4gImAHnvEcTa3NxT2IPp9 gRHxedJQryeFFKviNNjeR+Rwvi7Zyx+64zJ0eM4kwOmX7uVm2Lnc/ixV6URB4FtD1YcDWps8QZc guaPO/vj3pF/PNS1G+nbwiO0mBhFbcQd5NtDMoOErmc9tFQ8X6J1aSnESSc4HI/rIGpuWpawGT0 c+qP+i4puwINYD10WPLgZEEXbrJvCVybYzmh4ewOoOxlLQh/6fsDy08T27UCNzxlxC0Nq/Qm637 IONHM+l77fMK0vJttu9B6cE92EOmtweX9b9pfnqqHTzX7dlI= X-Received: by 2002:a05:622a:345:b0:51b:f992:9e18 with SMTP id d75a77b69052e-52d5949b962mr14542721cf.2.1786445699787; Tue, 11 Aug 2026 03:54:59 -0700 (PDT) X-Received: by 2002:a05:622a:345:b0:51b:f992:9e18 with SMTP id d75a77b69052e-52d5949b962mr14542311cf.2.1786445699238; Tue, 11 Aug 2026 03:54:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" , Thomas Huth , qemu-ppc@nongnu.org, Corey Minyard , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/7] hw/nmi: Remove @cpu_index argument from nmi_trigger() Date: Tue, 11 Aug 2026 12:54:22 +0200 Message-ID: <20260811105425.7429-5-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260811105425.7429-1-philmd@oss.qualcomm.com> References: <20260811105425.7429-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=Nb3WEWD4 c=1 sm=1 tr=0 ts=6a7aff84 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=FcA89Dn81BW4c7i3JskA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: rSNsPiGn2i9e3Y31DLx7JpPUcYiQkrxb X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX++lYAxNC6Wem BCuu68a92Udo4bMotAeNZ9e1+AYHLfMLKQtzVSOVOhQL5thysFINM2Mer4ffbSQU+7QdTdR09P0 Rj8rYFPATT6Z9BJB67j1HRzgE3HYTZg= X-Proofpoint-GUID: rSNsPiGn2i9e3Y31DLx7JpPUcYiQkrxb X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX8W17iwTK894n 8klrJVwUFdov70xJ8sZGrFUBqkNTtGjmMAOImd70jQc7RNT9pL/6PO9jZztSCLt3WPBpRQ8HLqZ kFJLkNn/k6yuEYM7JPqtZOQvDOrYPG/nuFvzVB7gQxSfsYW5fXq9Mj5KbvTP3pkvuruGduJR5Ot 8Zi1EdAJBg/Q67L4j+dEl3t30krPHzr4lkVEcnDueK+peA4yXn/hT2lZ7BA7gz+4JioBPM8Zubk pFd+wOba+NjGmsfPavdG0Q0Ihmzi8+kprnAYImncS1CjpncL0L46XSGIwihwWXDGwkd2SekCSz/ Nk/mrFtjw53ptR3/9e3MDKJb9aw0WLE3yC84GMu8HA9B8UKrcUnMZFEOIueWBqr50qPPp1aiR79 QotdDODT2r/oF7mv1SJAXKxPBXhpccLGoT8kTJocpTHvuvNCffhlWaPYCzOgBurMNMNCZzaI3zQ q9NKMYgDLKZjXeGdNJg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_01,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 impostorscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 adultscore=0 suspectscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110090 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, 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: , 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 @qualcomm.com) X-ZM-MESSAGEID: 1786445783062158500 From: Philippe Mathieu-Daud=C3=A9 nmi_monitor_handle() is not related to the monitor, rename it as nmi_trigger(). Return a boolean value indicating success / failure as recommended by the Error API since commit e3fe3988d7 ("error: Document Error API usage rules"). The 'cpu_index' argument is not used, remove it. Document nmi_trigger() as suggested by Peter Maydell in https://lore.kernel.org/qemu-devel/CAFEAcA-yALySmCJLbitCmYpiZKUXJNOavGJG9RY= eo8fKqz7gcw@mail.gmail.com/. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/nmi.h | 25 ++++++++++++++++++++++++- hw/core/nmi.c | 9 ++++----- hw/ipmi/ipmi.c | 3 +-- hw/watchdog/watchdog.c | 2 +- system/cpus.c | 2 +- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/include/hw/core/nmi.h b/include/hw/core/nmi.h index 4c4ce79071d..e77c382452a 100644 --- a/include/hw/core/nmi.h +++ b/include/hw/core/nmi.h @@ -46,6 +46,29 @@ struct NMIClass { void (*nmi_monitor_handler)(NMIState *ns, Error **errp); }; =20 -void nmi_monitor_handle(int cpu_index, Error **errp); +/** + * nmi_trigger: Trigger an NMI, in a machine-specific way + * @errp: pointer to error object + * + * This function triggers an NMI, in a machine-specific way. The + * intention is that this should typically trigger a guest kernel + * dump or reboot, and might happen as a result of user request + * from the monitor, watchdog timeouts, and similar events. + * (For example on the x86 PC it triggers an NMI on all CPUs, + * and on s390 it triggers the RESTART interrupt on the first CPU.) + * + * The NMI is triggered by looking for QOM objects which + * implement the TYPE_NMI interface, and calling their nmi_handler + * method. Usually it is the machine model class that implements + * this interface. + * + * Not all machines implement NMI handling; this function + * will return an error if used on a machine which does not + * implement NMIs. + * + * On success, return %true. + * On failure, store an error through @errp and return %false. + */ +bool nmi_trigger(Error **errp); =20 #endif /* NMI_H */ diff --git a/hw/core/nmi.c b/hw/core/nmi.c index ff6454437c1..662f2051123 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -22,11 +22,8 @@ #include "qemu/osdep.h" #include "hw/core/nmi.h" #include "qapi/error.h" -#include "qemu/module.h" -#include "monitor/monitor.h" =20 struct do_nmi_s { - int cpu_index; Error *err; bool handled; }; @@ -54,19 +51,21 @@ static int nmi_children(Object *o, struct do_nmi_s *ns) return object_child_foreach_recursive(o, do_nmi, ns); } =20 -void nmi_monitor_handle(int cpu_index, Error **errp) +bool nmi_trigger(Error **errp) { struct do_nmi_s ns =3D { - .cpu_index =3D cpu_index, .err =3D NULL, .handled =3D false }; =20 if (nmi_children(object_get_root(), &ns)) { error_propagate(errp, ns.err); + return false; } else if (!ns.handled) { error_setg(errp, "machine does not provide NMIs"); + return false; } + return true; } =20 static const TypeInfo nmi_info =3D { diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index 74818ff3cea..444af726d75 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -59,8 +59,7 @@ static int ipmi_do_hw_op(IPMIInterface *s, enum ipmi_op o= p, int checkonly) if (checkonly) { return 0; } - /* We don't care what CPU we use. */ - nmi_monitor_handle(0, NULL); + nmi_trigger(NULL); return 0; =20 case IPMI_SHUTDOWN_VIA_ACPI_OVERTEMP: diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 0842fe373ae..026768e9fb2 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -81,7 +81,7 @@ void watchdog_perform_action(void) =20 case WATCHDOG_ACTION_INJECT_NMI: qapi_event_send_watchdog(WATCHDOG_ACTION_INJECT_NMI); - nmi_monitor_handle(0, NULL); + nmi_trigger(NULL); break; =20 default: diff --git a/system/cpus.c b/system/cpus.c index 97e5a5edee2..5c0a192c01e 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -926,6 +926,6 @@ exit: =20 void qmp_inject_nmi(Error **errp) { - nmi_monitor_handle(monitor_get_cpu_index(monitor_cur()), errp); + nmi_trigger(errp); } =20 --=20 2.53.0 From nobody Mon Sep 28 00:33:13 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1786445767; cv=none; d=zohomail.com; s=zohoarc; b=S/Ux9spfLyQDN4jhIZry3miR2N2+cUCHOe+cDiZi+DPWPUiYsB9nsQnWBH/NXj1n99ggXSBSQifzkjo35FSX/upFbxDsW9TCHEuelNGHqpCu3lq9/x8ZWhqeQ7/SS80FD3MquPs5ww0gA6wInQLjnFqB7i2VJGYATkkCGvrk5ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786445767; 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=HxZTiY4hftmnkRlAI0itymOJtdwmyHMvObdJRrQQgrg=; b=ZURwS23Sqsz/vECZroXFY6MCsqDuE0pQwMDKKBpFYLppHc6SsE7xAuSev0JmwiIox3QqvnU9pnhoSh36s0zQRdhqhSPUqCEXpGT74Dw90+XdsLh/sh6MfLZ7LgNI1ssMOi5s13iQ/Na2HKRcIP/ozooyASuv/7JB4gvW6w25uTM= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786445767009167.78233257523652; Tue, 11 Aug 2026 03:56:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtk8w-0000Ws-AA; Tue, 11 Aug 2026 06:55:45 -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 1wtk8Y-0008Uv-3M for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:17 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtk8U-0000ML-BX for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:13 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BALnmf3288768 for ; Tue, 11 Aug 2026 10:55:09 GMT Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fyxwerw1e-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 10:55:08 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-51c1d137a68so63692421cf.3 for ; Tue, 11 Aug 2026 03:55:08 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4814a72a1fcsm3492404f8f.33.2026.08.11.03.55.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 03:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= HxZTiY4hftmnkRlAI0itymOJtdwmyHMvObdJRrQQgrg=; b=YotJQ//Gwmpbog/M EgRdCziu1tdHjrCggCjaWZnZVdkg7MnWnZAY9N8Wnl2rG5QPxbcaM3MNmp36bA3a +sTG79DjR4a59Vk77ZovcewAPteZleJtqGYUAfmwFwiIvralJ/DAxU+rD2HgjipT CCIaO/L7+A8zj+1Ixa99qzgynuWTHq0m0SbZ2ibMY6bpiXMfZs4g5pqbJgexRhT2 UtsPCI6UTWvMeGaHBChIJ+OkMND8nSjf056wZkTOreR8kU2fdBwNdOPTAdXfNI2D TPNVs5rXoO9Py2YP8u2WPCW1wzvhsBylq4a6Ox/PaPMLNI8qm1LcDKAjoO9Zf12r Cfbmlw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786445708; x=1787050508; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=HxZTiY4hftmnkRlAI0itymOJtdwmyHMvObdJRrQQgrg=; b=h4qLeTTTYbQGXWK7tRTL3S9GDDv262FQusAp55dA/JD6aatGP5Zas5AWT2CmgWzYMP csjL6rQ5PO2fgAzLye3yXm+tWZgcvzs7sHz0AgX+7H9v92U19sZTSBBmjdHXMROYcH5T 9I0MFVcnfhOR8FnQwRlWxlkUosDm+8BUFY0SL807KPbdErvr/cCBtBxpCi6NXr0YOt6j GKN3Hgp6VrExrPqjCJYBABA29xNAjWJXyct+BrevrzH+TVrQyQwTX1cBGDxpS1ypqETo KNdsb/MkrxIqbpyuCUidxgrhU13vHTVngNDiyaQJnIoP2pH7FKBsMsnXLnPW5UQTRzzs NuTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786445708; x=1787050508; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=HxZTiY4hftmnkRlAI0itymOJtdwmyHMvObdJRrQQgrg=; b=BkIkguYBKkGMaHQPV0nhZdR4TvdO00CSc1GolE5MQny3yiWd5FWdgUlE+pL9Kz+py+ 6vEGb0UtyHn9DTs2mHz+0OEIaszisfnn13ZC60rE7uumt1G8me1MPbFaIVUFTh4Pm7gd AiQ+SEG3xT07hRLUpvUGIUG7pgg7HZPYQmGwfrte2b4fdcb6q53HcJgU76z0EhWWUf3Z W3VtLYcnrzZQAp0d70D7FQ+gfTo0Lux2AyNAJlkntt63ytelyKOCOK6Og+lE/ORex4BK kWg8WljdijZHix5D+23Y9SOtwAriJrQr4bw7sAMhvs0WqbtGo1WeLuz4r1v9kT9qvu7C vsgA== X-Gm-Message-State: AOJu0YyBI1gJ4bMaH31v2sLeKPzaNVOjdQ7JPtw3CJLaWnas+2Z39FJE mvIhIMa0CseFiH9zPN4DmFkXUnpYwAkDepIOMmt01y96uGYjSQqZVQ2ZcN6eC9RODOYZH1Gf6MG +QB2y332EmftoAInRQstx/EpVVbHkQJgbsc5f0qXmS6Upq0wbVXnCui9Vj89+qcy+7g== X-Gm-Gg: AR+sD11L/qe7rkTz7aOgb69j/PsLOpRp969OjUdaIA+AcbVMdHFT8Ff6lpd49sBTBJN /s5GAwr5fN+zwpOYeDEAVXmdEIQamQFE/CmxMoaaoMo3KCQuOL3kPiKscjHRYEoJyGuR+MygSM+ +FGleTH1sVSXpXzzM9jDh+/k9Gb81nBsTQi4C/gAtRe8L3psye57MM70DLByR/utAWlOT3vUPr2 Fb3ONEhKEpnIUkkuo++0okkxJRxfXcim6zAfpGxslPCKQIvP6AsYKWCCEQxuG2d7I0I7YOkmTgE 65T6eI5evxxzTg/i9JnGfIhNFbljPssxBzare5cReqPhSAnpAqx9afnq85WMW4DzAFrlZy2iW7T OQd7v4QVhoCnIaioMUMA9YaQngcMD6YipCvoEv+1FvtUNPxw= X-Received: by 2002:a05:622a:4818:b0:51c:1027:34d4 with SMTP id d75a77b69052e-52d584fd96bmr19240241cf.11.1786445708421; Tue, 11 Aug 2026 03:55:08 -0700 (PDT) X-Received: by 2002:a05:622a:4818:b0:51c:1027:34d4 with SMTP id d75a77b69052e-52d584fd96bmr19239031cf.11.1786445707001; Tue, 11 Aug 2026 03:55:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" , Thomas Huth , qemu-ppc@nongnu.org, Corey Minyard , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Helge Deller , Paolo Bonzini , "Michael S. Tsirkin" , Laurent Vivier , Mark Cave-Ayland , Nicholas Piggin , Aditya Gupta , Glenn Miles , Harsh Prateek Bora , Halil Pasic , Christian Borntraeger , Eric Farman , Matthew Rosato , Ilya Leoshkevich , David Hildenbrand , Cornelia Huck Subject: [PATCH v3 5/7] hw/nmi: Rename nmi_monitor_handler() -> deliver_nmi() Date: Tue, 11 Aug 2026 12:54:23 +0200 Message-ID: <20260811105425.7429-6-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260811105425.7429-1-philmd@oss.qualcomm.com> References: <20260811105425.7429-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: LLVfaGXgE_OiUppwBikC6Of4R0Fb-rua X-Authority-Analysis: v=2.4 cv=K8QS2SWI c=1 sm=1 tr=0 ts=6a7aff8d cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=ffKbFpdEYwWhcrXovwUA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-ORIG-GUID: LLVfaGXgE_OiUppwBikC6Of4R0Fb-rua X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX8qb/xtmRF/m1 ISoHjTpXXOgCTovNSoEqBAjbGNFmQZ+zH51VDI/FFoVs3RhKJ7VycPF9gQVxqJlJ19YP8LYmvA8 OxaIBEpsVP1o44C0pjI3Wc77j8racZE= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX8m5MF67OOXdX nb20mJVjcg/q/V1FtHW+UIfVGZhov5FFUQo7Q4ex9+tLoyv3+azxPXAYtYg7XqGULncQ3oRK7j7 tSp8KfQrCwQYT0rPTBsInOIwShO+VlVdRPIiu/XGrzIjcO4BqEwenwVfVkUtNMs6J2psi6s9h3h OQQDM7U59m1Nv5ErJt36KL2Ok89cpKOTGXsbWltbOPFNAOLy0iKWdeilqz2kqZODSblfiL8Ya8T qTGbEBDl2cU2HEdsv2WQgUg9hEBxoFsaSX5beF1Hu2m1QRZDPep/9NIoQCTlA1NChAJ5fe8rCh1 3ZNK2nQw8MXQBLdXgV+wgi79SpbJDoH8jbVbc2ezJuXdNbDtMI09ogBlf5HVMGDfcpDP2HBDggG M023i8Gl5Bruy1yWfEug4mdTpqeEa+i2aycaCxfPS/AMnPObUIePTLookUjgL4W8oYo0La9OuqZ ADeAiHdYUukeCCTH2KQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_01,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 phishscore=0 impostorscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110090 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, 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: , 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 @qualcomm.com) X-ZM-MESSAGEID: 1786445768989158500 nmi_monitor_handler() is not related to the monitor, rename it as deliver_nmi(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/nmi.h | 4 ++-- hw/core/nmi.c | 2 +- hw/hppa/machine.c | 2 +- hw/i386/x86.c | 2 +- hw/intc/m68k_irqc.c | 2 +- hw/m68k/q800-glue.c | 2 +- hw/misc/macio/gpio.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/hw/core/nmi.h b/include/hw/core/nmi.h index e77c382452a..d6bd2a9fceb 100644 --- a/include/hw/core/nmi.h +++ b/include/hw/core/nmi.h @@ -38,12 +38,12 @@ struct NMIClass { InterfaceClass parent_class; =20 /** - * nmi_monitor_handler: Callback to handle NMI notifications. + * deliver_nmi: Callback to handle NMI notifications. * * @ns: Class #NMIState state * @errp: pointer to error object */ - void (*nmi_monitor_handler)(NMIState *ns, Error **errp); + void (*deliver_nmi)(NMIState *ns, Error **errp); }; =20 /** diff --git a/hw/core/nmi.c b/hw/core/nmi.c index 662f2051123..02c0ff2c21d 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -37,7 +37,7 @@ static int do_nmi(Object *o, void *opaque) NMIClass *nc =3D NMI_GET_CLASS(n); =20 ns->handled =3D true; - nc->nmi_monitor_handler(n, &ns->err); + nc->deliver_nmi(n, &ns->err); if (ns->err) { return -1; } diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 2b44debc388..47e0302bac8 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -851,7 +851,7 @@ static void hppa_machine_common_class_init(ObjectClass = *oc, const void *data) mc->default_ram_id =3D "hppa.ram"; mc->default_nic =3D "tulip"; =20 - nc->nmi_monitor_handler =3D hppa_nmi; + nc->deliver_nmi =3D hppa_nmi; } =20 static void HP_B160L_machine_init_class_init(ObjectClass *oc, const void *= data) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 0ea5453403d..48f7575895a 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -389,7 +389,7 @@ static void x86_machine_class_init(ObjectClass *oc, con= st void *data) mc->get_default_cpu_node_id =3D x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids =3D x86_possible_cpu_arch_ids; mc->kvm_type =3D x86_kvm_type; - nc->nmi_monitor_handler =3D x86_nmi; + nc->deliver_nmi =3D x86_nmi; =20 object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto", x86_machine_get_smm, x86_machine_set_smm, diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index bc41b44d455..281542e3997 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -97,7 +97,7 @@ static void m68k_irqc_class_init(ObjectClass *oc, const v= oid *data) InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(oc); =20 device_class_set_props(dc, m68k_irqc_properties); - nc->nmi_monitor_handler =3D m68k_nmi; + nc->deliver_nmi =3D m68k_nmi; device_class_set_legacy_reset(dc, m68k_irqc_reset); dc->vmsd =3D &vmstate_m68k_irqc; ic->get_statistics =3D m68k_irqc_get_statistics; diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index b13e5ef95f1..b75f7f44d3c 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -237,7 +237,7 @@ static void glue_class_init(ObjectClass *klass, const v= oid *data) dc->vmsd =3D &vmstate_glue; device_class_set_props(dc, glue_properties); rc->phases.hold =3D glue_reset_hold; - nc->nmi_monitor_handler =3D glue_nmi; + nc->deliver_nmi =3D glue_nmi; } =20 static const TypeInfo glue_info_types[] =3D { diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 1bdca728f97..086d90f20b6 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -201,7 +201,7 @@ static void macio_gpio_class_init(ObjectClass *oc, cons= t void *data) =20 device_class_set_legacy_reset(dc, macio_gpio_reset); dc->vmsd =3D &vmstate_macio_gpio; - nc->nmi_monitor_handler =3D macio_gpio_nmi; + nc->deliver_nmi =3D macio_gpio_nmi; } =20 static const TypeInfo macio_gpio_init_info =3D { diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 8676be7bbb1..bfb1d45d058 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -3583,7 +3583,7 @@ static void pnv_machine_class_init(ObjectClass *oc, c= onst void *data) mc->default_ram_size =3D 1 * GiB; mc->default_ram_id =3D "pnv.ram"; ispc->print_info =3D pnv_pic_print_info; - nc->nmi_monitor_handler =3D pnv_nmi; + nc->deliver_nmi =3D pnv_nmi; =20 object_class_property_add_bool(oc, "hb-mode", pnv_machine_get_hb, pnv_machine_set_hb); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 189334b9f0a..ed545acf3c0 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4652,7 +4652,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= const void *data) mc->nvdimm_supported =3D true; smc->resize_hpt_default =3D SPAPR_RESIZE_HPT_ENABLED; fwc->get_dev_path =3D spapr_get_fw_dev_path; - nc->nmi_monitor_handler =3D spapr_nmi; + nc->deliver_nmi =3D spapr_nmi; vhc->cpu_in_nested =3D spapr_cpu_in_nested; vhc->deliver_hv_excp =3D spapr_exit_nested; vhc->hypercall =3D emulate_spapr_hypercall; diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 5d8a73a63df..f9e8ecb4fe0 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -830,7 +830,7 @@ static void ccw_machine_class_init(ObjectClass *oc, con= st void *data) hc->plug =3D s390_machine_device_plug; hc->unplug_request =3D s390_machine_device_unplug_request; hc->unplug =3D s390_machine_device_unplug; - nc->nmi_monitor_handler =3D s390_nmi; + nc->deliver_nmi =3D s390_nmi; mc->default_ram_id =3D "s390.ram"; mc->default_nic =3D "virtio-net-ccw"; dsi->qmp_dump_skeys =3D s390_qmp_dump_skeys; --=20 2.53.0 From nobody Mon Sep 28 00:33:13 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1786445810; cv=none; d=zohomail.com; s=zohoarc; b=GdX9ibixL1Sbf8f0Hu/wmoqkuTS5Ch784681Us91RtDPMnwF+Q/o7czElRroqgHemMh4Ea9flsUknRLo8a/7iCTa9g4f+LxIwlRG4f2daSIn5PiIk/iDx3WcCjxJkbcMcy7GJyT9gD66BlOcWiQOSQLLyKhCgexa03Q/PajgBXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786445810; 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=bcgG1w08NZt/b36jhnBwiPFIYGpEfokKXu7wwwpAve4=; b=jXYqOqyAhCBt74vCPaPHXtBf19y4BTVmNtFlaLbSCmWMw7iMGhUNng8b7OLeUnWjq+Ig9Qa4N+oZ1QEy4EMW2NhneUg4dgWaUk42Fy47UZ2aKAi2R2QcuS5U/aQYWSOPeOIBKI5KoMbCWvreB8U2n4Y6Kp0B6XDgKSi+n3lmuz4= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786445810548938.7907467363839; Tue, 11 Aug 2026 03:56:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtk9a-00018i-HU; Tue, 11 Aug 2026 06:56:18 -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 1wtk8s-0000Sm-9u for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:34 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtk8l-0000N0-IH for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:33 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BAMXcc661416 for ; Tue, 11 Aug 2026 10:55:16 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fyjyfuntd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 10:55:15 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c1a9764f0so4014141cf.1 for ; Tue, 11 Aug 2026 03:55:15 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4814a5be110sm3639112f8f.10.2026.08.11.03.55.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 03:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= bcgG1w08NZt/b36jhnBwiPFIYGpEfokKXu7wwwpAve4=; b=kMGS1SyqfocZjbQ9 mIL3+LYXtMgCwzFUlaw+RyJV9zvVVqi21zCvkcvwXElo/v/O26YnGWIT4et43y5H TeXF14ogCA92lz8PRsSPa4wzfiitqI0Zc2B7l7wlDocDwfKe43/CSKP158gfFZPr saG31eAdnheVeNj5S5SpLtA07azEoSxYYKOf1AV8cChNnB+kTWtrSwG3Lk7u3VOw eW/Gce8BWeNPDuszd6LEc0OyunqT+/JQc194fqiP3oI1VV0HBNhMIkG65Wzj0Nuj r9+l7DNDfhmIyCdBDlqYLRHWBf9R3ggRCLOPOlHDSJXAQb7zBQC46PqwIPS7vIXA q4YsPg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786445715; x=1787050515; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=bcgG1w08NZt/b36jhnBwiPFIYGpEfokKXu7wwwpAve4=; b=hDpPDnANtDRmUC8Ow1k9yiGak33xQzAfhuAedOTLzPFU0TkxUSMtj4m1OSXU5S+AhT PJh73RuSfsGNPq6b+dX+Q0vt3YAxpucM1SFiwor2kHG3+K9u6ZcqAg/FJCl7gyYYYEOF fbQqlbpmIMi74p3FgSR+K6x5t1tRYURVmWs+TUbcVdgf6WeXt0YnIXI6PYQxAnIBczCs +KBVTNbpOeR+h7P0gHDz4KXktNEO/h/Dkwagsqmz6/RbM+uuWtGVuVp3CUm8JmDfSF15 a4YO8konHa5KvFG2kFjSoa2ridvpoWP+1j1Q1rFLc9nE4jN66dy6yoPgy0N8BIYaDaBP TOJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786445715; x=1787050515; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bcgG1w08NZt/b36jhnBwiPFIYGpEfokKXu7wwwpAve4=; b=LbaF7MmYsu8u/V+XvbrhARrMYz2pAcn3wTRCXhSyeUcVIC+ju0EglBfCh4/bFD9SSu yGaIfo6n/1jfEuj4b76cLOyF8Unmw592ng+i9jCq7CJtyVujLak2CbUz13UMNxs5dMTr ulMs9A3wxqorekpSGs4U/qHY+GM1J9wTXPjejKXtRQTge6BVdNW+A4X5WtIXHTgQlxzE 8/qgdiWNiUZ3DTHVupLUWb4filYvBMToIqHkYQehH0wLrwxD9Rod3n9Q8Nca7R68Zjhv UpPLp8wJKjsKxxNS84H+T6mRR0H3KNCC8x5nf0QA7oqeQUvjcB7zsvh7gDzTi2UbCFBu fPXw== X-Gm-Message-State: AOJu0YxeI2GwcVEEk5vTCyyrNEPtFq3L78lOiAgGUGl2Z9ySAaDbqnh2 GSDrVk4DtBfsVBJvLqcw3yUuQIic3k6tiqaQt5JAlD9L+O2ob2SZAepxUPoqtcMN6gO7K79LnFi rxO7LdtvF+LFAq79NqLIRERwvXUXhAbqHarbgT5yvHD7Cz8KfCtpkl4Wtt/1ANfnRVw== X-Gm-Gg: AR+sD12xDwZfwOn6FnXMuhNJZfFYdqPVdtZHYNA9CbrZvd6Dy8pXWpe+aPn57Yog3wL tTRxicyNx0Q0bVIoChZN29kv2dQOUS4x3ZKIleah4ccORgENsUAP7C+UCL552bjgBA9nFKXW6fi WlPDxdZIDkc9KS3ERfWXm33/ElyF+ZbEzwTh6x7Mp0RDXOKTz3fynoH8png/jHGMHTJ6rmjgGLb GOvQEEW3Ru/KB+AxMyjXhNyx8DJG3JHd1umQRQ2EdI0HDsTl26+gb6VISTFF9kcD+HvKziAraKs /8awKLepiiOlk8FUyIG5pb9PNw48ZMN6Ej1i5pUHqoOtEbk1060l0VreELijIuOgSa7WuWsV0oC MpgU8tdQN1PselwF5RIfJvtCSxHXvEZMXWkuqnsvMdnpfJq8= X-Received: by 2002:ac8:6909:0:b0:51c:2022:cef5 with SMTP id d75a77b69052e-52d585d80d9mr17728521cf.26.1786445715320; Tue, 11 Aug 2026 03:55:15 -0700 (PDT) X-Received: by 2002:ac8:6909:0:b0:51c:2022:cef5 with SMTP id d75a77b69052e-52d585d80d9mr17728131cf.26.1786445714883; Tue, 11 Aug 2026 03:55:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" , Thomas Huth , qemu-ppc@nongnu.org, Corey Minyard , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Helge Deller , "Michael S. Tsirkin" , Paolo Bonzini , Laurent Vivier , Mark Cave-Ayland , Nicholas Piggin , Aditya Gupta , Glenn Miles , Harsh Prateek Bora , Cornelia Huck , Eric Farman , Matthew Rosato , Halil Pasic , Christian Borntraeger , Ilya Leoshkevich , David Hildenbrand Subject: [PATCH v3 6/7] hw/nmi: Remove unused @errp argument from deliver_nmi() Date: Tue, 11 Aug 2026 12:54:24 +0200 Message-ID: <20260811105425.7429-7-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260811105425.7429-1-philmd@oss.qualcomm.com> References: <20260811105425.7429-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 2GlorfXjnKuzxRGBR3vcsXR6rM2ZwdyO X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX6Pup8UE+hQP4 GCjaZuAuWV5jUhqfvNtw43sYBi012LpykPDoNee8fH+l6WCqITrERul18aHoKnxVLWeDqxVY36P j8YM54yPdhlys2j9sFPJysYtDsEYBvM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX0zOPwrqs9mm2 +w0E032rUi9GDwMBA6gsMsymMzoAgImRdKsFBlxPZqALHI08q3PyKK8xL2SX2ktz5YRdTpY0Nil kgv+xt+vsnvkCmPWx22akSCYq1wrkApqOPCxdjJizilJWxjPhTV5eq74ag76nA/1kL2xuE5nvpC 8ifIA8wL7rmUbgyxnTst6yMcu351UhXM1yW2GuJ/BXK4pF7LYj3p6XoXdoEov+6L+g5HYF23Eb9 TpQqEz8gobbYEyA756/+s7O05BNkrf3UzDLiH/HEcJXy9f06jVBS7Oy3FYpiacsBIqx397SXo3n TkZifX0NDFggfapCZcubjX5GwGexQ9+uhyW3CJXrxiXv89NV3X13GxIJQ5UlixcFb7iP/nXhpkd j8yn+wc6iB74GL3d4dZj++esAWMx/u9LN6H7LN2Su0HgoWMm+E5TDnU4slxOKHGvZJo849PAPmZ yrf1jhRUETSR5eq1hWA== X-Proofpoint-GUID: 2GlorfXjnKuzxRGBR3vcsXR6rM2ZwdyO X-Authority-Analysis: v=2.4 cv=Zd4t8MVA c=1 sm=1 tr=0 ts=6a7aff93 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=799TcV0OOjXjlcq3EAkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_01,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 adultscore=0 priorityscore=1501 spamscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110090 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, 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: , 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 @qualcomm.com) X-ZM-MESSAGEID: 1786445810924158500 Not a single handler update @errp. The single user is nmi_trigger() filling with "machine does not provide NMIs". Remove the unused argument from the deliver_nmi() callback, simplifying the methods in hw/core/nmi.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- include/hw/core/nmi.h | 3 +-- hw/core/nmi.c | 32 ++++++-------------------------- hw/hppa/machine.c | 2 +- hw/i386/x86.c | 2 +- hw/intc/m68k_irqc.c | 2 +- hw/m68k/q800-glue.c | 2 +- hw/misc/macio/gpio.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- 10 files changed, 15 insertions(+), 36 deletions(-) diff --git a/include/hw/core/nmi.h b/include/hw/core/nmi.h index d6bd2a9fceb..b0f58542bcc 100644 --- a/include/hw/core/nmi.h +++ b/include/hw/core/nmi.h @@ -41,9 +41,8 @@ struct NMIClass { * deliver_nmi: Callback to handle NMI notifications. * * @ns: Class #NMIState state - * @errp: pointer to error object */ - void (*deliver_nmi)(NMIState *ns, Error **errp); + void (*deliver_nmi)(NMIState *ns); }; =20 /** diff --git a/hw/core/nmi.c b/hw/core/nmi.c index 02c0ff2c21d..8eea75ad530 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -23,45 +23,25 @@ #include "hw/core/nmi.h" #include "qapi/error.h" =20 -struct do_nmi_s { - Error *err; - bool handled; -}; - static int do_nmi(Object *o, void *opaque) { - struct do_nmi_s *ns =3D opaque; + bool *handled =3D opaque; NMIState *n =3D (NMIState *) object_dynamic_cast(o, TYPE_NMI); =20 if (n) { - NMIClass *nc =3D NMI_GET_CLASS(n); - - ns->handled =3D true; - nc->deliver_nmi(n, &ns->err); - if (ns->err) { - return -1; - } + *handled =3D true; + NMI_GET_CLASS(n)->deliver_nmi(n); } =20 return 0; } =20 -static int nmi_children(Object *o, struct do_nmi_s *ns) -{ - return object_child_foreach_recursive(o, do_nmi, ns); -} - bool nmi_trigger(Error **errp) { - struct do_nmi_s ns =3D { - .err =3D NULL, - .handled =3D false - }; + bool handled =3D false; =20 - if (nmi_children(object_get_root(), &ns)) { - error_propagate(errp, ns.err); - return false; - } else if (!ns.handled) { + object_child_foreach_recursive(object_get_root(), do_nmi, &handled); + if (!handled) { error_setg(errp, "machine does not provide NMIs"); return false; } diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 47e0302bac8..51ecdabdbd5 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -829,7 +829,7 @@ static void hppa_machine_reset(MachineState *ms, ResetT= ype type) cpu[0]->env.cmdline_or_bootorder =3D 'c'; } =20 -static void hppa_nmi(NMIState *ns, Error **errp) +static void hppa_nmi(NMIState *ns) { CPUState *cs; =20 diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 48f7575895a..8d82bd890da 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -147,7 +147,7 @@ static const CPUArchIdList *x86_possible_cpu_arch_ids(M= achineState *ms) return ms->possible_cpus; } =20 -static void x86_nmi(NMIState *ns, Error **errp) +static void x86_nmi(NMIState *ns) { /* cpu index isn't used */ CPUState *cs; diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index 281542e3997..b78ca5ca11b 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -70,7 +70,7 @@ static void m68k_irqc_instance_init(Object *obj) qdev_init_gpio_in(DEVICE(obj), m68k_set_irq, M68K_IRQC_LEVEL_NUM); } =20 -static void m68k_nmi(NMIState *n, Error **errp) +static void m68k_nmi(NMIState *n) { m68k_set_irq(n, M68K_IRQC_LEVEL_7, 1); } diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index b75f7f44d3c..8be7696777e 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -159,7 +159,7 @@ static void glue_auxmode_set_irq(void *opaque, int irq,= int level) s->auxmode =3D level; } =20 -static void glue_nmi(NMIState *n, Error **errp) +static void glue_nmi(NMIState *n) { GLUEState *s =3D GLUE(n); =20 diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 086d90f20b6..ba4df62c674 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -188,7 +188,7 @@ static void macio_gpio_reset(DeviceState *dev) macio_set_gpio(s, 1, true); } =20 -static void macio_gpio_nmi(NMIState *n, Error **errp) +static void macio_gpio_nmi(NMIState *n) { macio_set_gpio(MACIO_GPIO(n), 9, true); macio_set_gpio(MACIO_GPIO(n), 9, false); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index bfb1d45d058..2ec0c198fa5 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -3552,7 +3552,7 @@ static void pnv_cpu_do_nmi(PnvChip *chip, PowerPCCPU = *cpu, void *opaque) async_run_on_cpu(CPU(cpu), pnv_cpu_do_nmi_on_cpu, RUN_ON_CPU_HOST_INT(= 0)); } =20 -static void pnv_nmi(NMIState *ns, Error **errp) +static void pnv_nmi(NMIState *ns) { PnvMachineState *pnv =3D PNV_MACHINE(qdev_get_machine()); int i; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ed545acf3c0..477054d8c85 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3550,7 +3550,7 @@ void spapr_do_system_reset_on_cpu(CPUState *cs, run_o= n_cpu_data arg) } } =20 -static void spapr_nmi(NMIState *ns, Error **errp) +static void spapr_nmi(NMIState *ns) { CPUState *cs; =20 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index f9e8ecb4fe0..255698fd7ed 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -725,7 +725,7 @@ static HotplugHandler *s390_get_hotplug_handler(Machine= State *machine, return NULL; } =20 -static void s390_nmi(NMIState *ns, Error **errp) +static void s390_nmi(NMIState *ns) { s390_cpu_restart(S390_CPU(first_cpu)); } --=20 2.53.0 From nobody Mon Sep 28 00:33:13 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1786445794; cv=none; d=zohomail.com; s=zohoarc; b=JgHxWfPLo/R8ri3xD8zpsaHrMniJmmo/+uHm7QAj4w18ttlA/AxrTrC40uABPOfO/DP6vOsfqgEQ9r539slQeAY27W0vryRkCSc0oXQW/2H+OTHCU6NuqoTNfKFlmlpDt2Nq4kL9BXbPSxsQ8rEyxQG5uslX1KXdZpLA1GifyKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786445794; 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=o9npvER9sQENMrIsjztsN/dYiR+wtNfB61hxFSrTizI=; b=LKI8qWOLNoiQDdUl37S1GU7grREhduF1kufmAgiKPncZplBi+P7IkcOAWOLcBjHU/JvwdGcuaVDm3fofns90f5oCQnEsmmusv4RKDzdDglUwkvMqrIubR8w1yt9kXKuys/xoAUy7GKzGKyQlGBodILqwPCR3FV+hsBnnYmDZISY= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786445794417322.72039893041836; Tue, 11 Aug 2026 03:56:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtk9U-00012d-Mm; Tue, 11 Aug 2026 06:56:14 -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 1wtk92-0000b0-Py for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:47 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtk91-0000Nr-Cv for qemu-devel@nongnu.org; Tue, 11 Aug 2026 06:55:44 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BAM5tD267664 for ; Tue, 11 Aug 2026 10:55:24 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fyjjv3pmv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 10:55:23 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-5174a23afcbso35053311cf.3 for ; Tue, 11 Aug 2026 03:55:23 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49977dfab57sm29761765e9.1.2026.08.11.03.55.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 03:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= o9npvER9sQENMrIsjztsN/dYiR+wtNfB61hxFSrTizI=; b=jO1q21axpwLaNcGM P2treDKkd0TuLKpLOmmsTZTdAepQf4cvyaP1jk6oLE3VS6hFMODtjM+weNqiqu8r nBgDjMPCm5M9O9F2R8wKPoNnhmGomSgdpT6I7OLyiXaSNxxuUXpE5Crd4EEizUa+ Fx8m0C1S0QRXjMEoBwwV0526nBO56CeKCS85RR4kN7NofU4E77HsFBV+AyTZ8PbN tXtM6U9B+fLUzJjvLWLhMyZdBjEQR0nXKmJQu63WogWDr8TimwsNbYJEuzWOAKc2 vV1SV6x7PzJ52ZhteLotZ2p5CXYA8rK8wx5Uq91QbPohX66PHxTfY6m4PT4LnaUZ 5DVO8Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786445723; x=1787050523; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=o9npvER9sQENMrIsjztsN/dYiR+wtNfB61hxFSrTizI=; b=jKqjyXGeVv6T0kGtZoiRTgQDgfIsblMcc/frwXOW1NRs/ufVrFXjsqgttCscjqimmC sjlKzGOA8ZldetyBrKQwzPxrUUDABE8KcwrDYNpr/9Pn1M+2BP8vlzwJu7l5KhW/jCvj SYL5bwrmZQk+tv7x7otNhpCrsSFTZDW262EdwhIeun2D7KfaDFOXLc+EcSc0wFj3/3Zg TXAyTT2UMwlEFj8ldYF/ThmxswyxDc6cNgUMPIBIvjvjpkHmrCxHSer8N6e0o8lVvkHq w//VYrHiwcmyb7/o0OtrYf1nXqQCAjwHzGrpO7SAWe/jQo9zN17QNUgEM65x7Rr5UuYx E58g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786445723; x=1787050523; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=o9npvER9sQENMrIsjztsN/dYiR+wtNfB61hxFSrTizI=; b=FvnTmXBnJVq+htcdCuWSiOJWpmlgaccD9ILRUY3//JTihBahqmNGiXzeId1dBNAdQJ PBl3G5FyExhO9ZepSLNPMLCZZnteLULHT4ESltcXwxl4scIr7L5eTdPltkAIpiOYUjxj fhp7eNw1N/itdOnsEGffoiXMiXz029pxOM68Ixe9gDlymJpyRJP7hw923mkUvRYBPMc3 DqJtsb2e1taY0H/AkGTLSFDfhHIHWn6E01xsJYqET3Hi4SBEQ05ZHU2ifkdWCmAfEZyx nCGMJruIZY787J69ed0fkna2oeZL+6MAm5bV8X0SOJjHvQiZ+/NO0B13BxmZs5Twwp8Y KZ7A== X-Gm-Message-State: AOJu0YxHujIMfgz+WiRf1PbPjMPLjdIbLlYyCEcPRKURVIeSznhZv9P+ 2g5saHi1poqDrl9Imwe6oimwGE5TRpQNx7xNIGMWhDr79heUrx3ytiLTmz3yx75Y7sF8fKDVXnJ ov6rymxh+u3UI2xZ0FXYpNc5fZL06fEoVKmH200wDDA9johMFMjY8ZlGKYstyb5vEFQ== X-Gm-Gg: AR+sD105OlT5lfTk1uoPECcHDBDBJUHFvlym3rkhxib7R3+LohFc6u5gJBrP1zMAtlD nHaSxW/3CSSqdJcQQxSXWiUEBVfs66DftNRUhcT1XcuqF5y71F1qKTBjvWDIx85AwfRwzaxp5Ka XcZTpCdnpNogTjPxWJ/AgMutBq2t179sdgFszinLutCYaGd6nyRUliN6AJewIk2Kp0e7wDtu+53 OkC9EJurg0wLbROWWtpRtOxr5XlLt1B+hO3Bi+SyjaehLOm7qZWBQT7iccWCmt9PNQfcLY3DMd2 8C20O94MKnDGJzSL4EQ3Cdq+m8OqGnu7MYYCDN17vnceX3od6I9CG93YntTGRYqoSwlJoQPtqxP G9XwmPUU7MUEPUA4oCK7T3X+E3PaTt3PstNfJ4vvjL//On/s= X-Received: by 2002:ac8:5f48:0:b0:51c:17cd:1fe8 with SMTP id d75a77b69052e-52d5867246amr13607251cf.33.1786445723295; Tue, 11 Aug 2026 03:55:23 -0700 (PDT) X-Received: by 2002:ac8:5f48:0:b0:51c:17cd:1fe8 with SMTP id d75a77b69052e-52d5867246amr13607051cf.33.1786445722878; Tue, 11 Aug 2026 03:55:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" , Thomas Huth , qemu-ppc@nongnu.org, Corey Minyard , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH v3 7/7] hw/nmi: Deliver NMI only once Date: Tue, 11 Aug 2026 12:54:25 +0200 Message-ID: <20260811105425.7429-8-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260811105425.7429-1-philmd@oss.qualcomm.com> References: <20260811105425.7429-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfX5Bogi4V9vskx ilmO7oUUKFLNLHJwtTZFqX+QQezB6azPvX3Io9hqTvm+rtqM+MDYSDtKIHb0TBXRIGNFmvIyBRZ tGqeX3k7Qd2ufXUq2vQ0OpesrbRvhDr3NS2gERHyBZ3iGhqtlI9U0Q3eToN+y9xll/HxaMgbvLV v8ViGxmE6cUDGeIYukLMm7ywIP/iC2gEqyfkBUix1t3FzJm8w2K1GtH5wp2nNwd8QVLh3LXkO6D ERUnfKFIiVYamY1trgsDe7J/Mk2jWcAeCeiQO6/7PzBMKSZRuVGDM/ePWr+vKEWnbju8eA/ZXoS tTT+MNGQhweSdPEiv+lESqoA19AHy2+UuZM7ZPoFUjtgo4RNkhE80iLaOCOlp3S5j7RJYr3GB03 aMcaBmR8YJ+WctrKAYzBPUnnTwLp/CoCxWPWMSlPu3Whta/mdpyiduIgWk5iX+FuuMRcjB0Sb3u md5fQi19SsnCQHZyVtA== X-Proofpoint-ORIG-GUID: SZd5Ryx9E8I7J115kQ8hkTr6XFIDAWIm X-Authority-Analysis: v=2.4 cv=KLtqylFo c=1 sm=1 tr=0 ts=6a7aff9b cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=vYvZ14fGrqJeX4HkdWMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: SZd5Ryx9E8I7J115kQ8hkTr6XFIDAWIm X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDA5MCBTYWx0ZWRfXwpSAAoFjjkWI +kx7xLKfzY2e7M0Qp9OXDcX47itIUYeM0KZJISMRPFCnYx7laJMEfHuyeM/NoyP121Q0iHlmNsl qfXaT8jtSXD7lNUZceYf2Lv7YSQELbo= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_01,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 priorityscore=1501 bulkscore=0 spamscore=0 adultscore=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110090 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=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, 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: , 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 @qualcomm.com) X-ZM-MESSAGEID: 1786445794791158500 Use the first handler available to deliver NMI only once. If anothers handlers are available, no need to keep delivering. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/core/nmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/core/nmi.c b/hw/core/nmi.c index 8eea75ad530..4fe5ee75bfc 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -31,6 +31,8 @@ static int do_nmi(Object *o, void *opaque) if (n) { *handled =3D true; NMI_GET_CLASS(n)->deliver_nmi(n); + /* We only need to deliver NMI once */ + return 1; } =20 return 0; --=20 2.53.0