Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 461DFC4452F for ; Tue, 21 Jul 2026 12:22:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wm9Tu-0002ul-V1; Tue, 21 Jul 2026 08:21:55 -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 1wm9Tp-0002kj-V5 for qemu-devel@nongnu.org; Tue, 21 Jul 2026 08:21:51 -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 1wm9Tn-0003tz-Vt for qemu-devel@nongnu.org; Tue, 21 Jul 2026 08:21:49 -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 66LARJwV1385792 for ; Tue, 21 Jul 2026 12:21:46 GMT 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= CCs6xzzmYXlvnPqjtMYRNkoTvkbP9Kw7t9pq1Mn1d5g=; b=P9J6/4jc/bbOYzbr LoWP4YVYGc5OuqCXzj/lyAoQ+bObpPOPAuOmyzZK0IowCViaPdxJboGu1nFZBrB6 ateFtVon/ovH/tYfvqiIBezUJ4akc+sDFYISf7JRAdYSfu+GLAyBfsYobNqo9X48 zFOv/fRl1UKSLhyVoK6zwve8g4vWiPnWpQL8gUomeOgSYF7a/H9pF/3W0krQNp7P i4vFElifHAZpJS8oTRJ7/AoRDt7It/OSzauEuQ6iPkNdJN2pg0WVcm+1k+poERLE HHcm2ySLah2+jD/OXFmOg0mG5Fn7TdxIaaRwaMspI48iMxk+OrV6UK9sHKK7EGi7 VAniow== 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 4fj1se23qh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 12:21:46 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-520a00c7a03so130769171cf.1 for ; Tue, 21 Jul 2026 05:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784636506; x=1785241306; 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=CCs6xzzmYXlvnPqjtMYRNkoTvkbP9Kw7t9pq1Mn1d5g=; b=A5M93Aw52BkAEJqGD8VkWi+jXdncj7mkM/GkxFPcsP873XPxjIrGG26X4yrQwcv9c/ Vn58qa0mLdVxFY536U+wIELfmpjztEFO5/4Ug3cJ4kDLBGpUJp6OqviL9z/WkrtB6Vub 19iTb4ynMN6UEBSZaisa0vuGajDlRUcrW/Cv8AKcXJ78AviptL5yxhmQ02Z26AUcACkD vaVUczV3VBDsl9Mhvpmyl2LN4tOPtxhaKcrJqW6yoqqrbD+n8NoctLkBuKa8qonMWhFr yihfKkj42NX78CJkkXBITHDfaJCOlsSjJwI+yhRUggGqKWum5TNTefC+SXqI5aN2z+lZ F1DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784636506; x=1785241306; 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=CCs6xzzmYXlvnPqjtMYRNkoTvkbP9Kw7t9pq1Mn1d5g=; b=jt+tM4BKZP15zuxf11JD4B4ger6bLKNpauxD2zktrZGOrJvtkq5040Z89QQH8zBeFX FT8EQE17IiQ9978/fLcl4nXtpNfpVMYx/cxh/SP9FP4VoZXjPa87JSwFj+F86cfuzmUu M3T8tq/QzNfHcM24mER/LVbgNLK66g8Y47sDaj/QXf0qBdpoOIo1t6i3ryL4cg0GBGph ZSp8bRDQ0llwEx0TH4VicAr2wCpm3N7cW9/FpKUOwAGJ3E4xPRf32EoK2Yw/PJ8NXBdV Qq1N515E5UKDLLdWylNYjGhzXsMD6Y3/bbcYp3Frlor5TVCic71LLdl9S+xbdCgXbznt UoPg== X-Gm-Message-State: AOJu0YwSMq8vn4kXMnbKOdX5vAd3rFYYfNNZELNpTjR76+LD77bwdKse kmnxHKnBTDQEqSZ6KtTGuJUDqkEUdM6LWqefKK47MGxi3u/755lO06V066bcJeZ6UXsTYhxerah sz3/yY4nOBAKSNA49cTZNoV6csKs9L453uFTLMQU0SDSZ+HhYzqzlLBzNLNVcOy77cQ== X-Gm-Gg: AfdE7ckcd05PoztMznsFE96APSA5be7G9iOVyph3EARFRxNesz2eE43D3aUMRzLDb0G Qe1BimnVvGKMCuePNyD8vINymoMHAuflgrZbgbd/Ajl/oKWvWDR79DIlOzYqKRJVX9cIK7t1xnZ zgsRJcJ66Ax4kNQR9odmiy4rFDLn60aWNPbQh0oYfah9N+SU73IK/V2WSOCjM0QvZzw7OQrjeef UghVCDeRgCTGFm1DczQhc3Ko48TqZfQpvat9PF379P4Nf6VIya0J109FvAMx6YOjx/V3UfBzb/Y JbtzF1EtTSxOIjyWpbq4jWcciM06ehzcyE0UU6WVQYgBzr77E9M0Pv8bqZFkVL4MKkoyLIB4Jde dw/WcDhOn0J702h1fAAVejou/dzRrfVwd35uFKjaFeI6apMo+rf12hYU5Lw== X-Received: by 2002:a05:622a:60a:b0:516:db5d:ebf9 with SMTP id d75a77b69052e-5213e8769f5mr180499941cf.48.1784636505639; Tue, 21 Jul 2026 05:21:45 -0700 (PDT) X-Received: by 2002:a05:622a:60a:b0:516:db5d:ebf9 with SMTP id d75a77b69052e-5213e8769f5mr180499481cf.48.1784636505044; Tue, 21 Jul 2026 05:21:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f63ee0086sm41657086f8f.30.2026.07.21.05.21.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Jul 2026 05:21:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] hw/intc/arm_gicv3: Fix ARM_GICV3 dependency for KVM / WHPX Date: Tue, 21 Jul 2026 14:21:31 +0200 Message-ID: <20260721122135.6288-2-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260721122135.6288-1-philmd@oss.qualcomm.com> References: <20260721122135.6288-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: 4O-ZVAhd6KhzuU-u425j6mv-RJEYvgdk X-Authority-Analysis: v=2.4 cv=TIZ1jVla c=1 sm=1 tr=0 ts=6a5f645a cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=PZoDgyjJWSAZIzKEYywA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDEzMSBTYWx0ZWRfX0KtF1FdXVwuS NbCq1ZDiPamWU8VlpCJMWT1lhuY3FKSBfEJImzzO9qaqLknFDiqpXTmr4DCHfzxoOIjq1lJtt8D +vP1a3b3t03hlirwoRxm3FBtEJzW4Is= X-Proofpoint-GUID: 4O-ZVAhd6KhzuU-u425j6mv-RJEYvgdk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDEzMSBTYWx0ZWRfX/eLoG4NBDcqs YJkC20o88Py6itc21KgywPUaSv7qNYEXc6qID8g5ZWIgA5s+/A8v5r+GnYZkI6hYp6EW2kqp1ge p/xkLXPYGleUCLESQ6nZZ95UTo4AO2eyrJATaEoqFvts5ctCDy/XiANWn8SIBipdGag8yuchxKW Gt8XehtfyOCUvaBDRs7SV9xsHoZX/uSnf71YRxxKgMRR1sG+zTwgLjTrbxnVA+fRW/Um5Zn+0f3 vz9Ya4jHUIeh+2iB0iGWXBz/j+uZkZWDMnTg+3zyyTEDqV+icRmN5wjShomDp8NqXYwZrUe+152 57gQ2BfuEDSN50SoHV/8vbhnpoUMbQThGo9lgc88WoF24D2LVCigjFu62GEskMV4XGCZT7s0Ea4 IvG5v6cTaYh7SoFRxI9knfyeJVFowQKtflgZbJNu3HXuwpERwtRCtoozpwRXUMP3IRobwwdbCw5 CsmEuN92s0vCnpEzyHQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-21_01,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 clxscore=1015 malwarescore=0 bulkscore=0 suspectscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210131 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org KVM and WHPX GICv3 implementations call gicv3_init_irqs_and_mmio() which is defined in arm_gicv3_common.c, itself build when ARM_GIC is selected. Both KVM and WHPX are conditional on ARM_GICV3, itself selecting ARM_GIC. Only build the ARM_GICV3 accelerator variants when ARM_GICV3 is selected. $ git grep -w gicv3_init_irqs_and_mmio hw/intc/arm_gicv3_common.c:314:void gicv3_init_irqs_and_mmio(GICv3State *s, hw/intc/arm_gicv3.c:450: gicv3_init_irqs_and_mmio(s, gicv3_set_irq, gic_ops); hw/intc/arm_gicv3_hvf.c:710: gicv3_init_irqs_and_mmio(s, hvf_gicv3_set_irq, NULL); hw/intc/arm_gicv3_kvm.c:822: gicv3_init_irqs_and_mmio(s, kvm_arm_gicv3_set_irq, NULL); hw/intc/arm_gicv3_whpx.c:186: gicv3_init_irqs_and_mmio(s, whpx_gicv3_set_irq, NULL); Fixes: a7bf30342e6 ("hw/intc: Initial implementation of vGICv3") Fixes: e4c95f78a47 ("hw, target, accel: whpx: change apic_in_platform to kernel_irqchip") Signed-off-by: Philippe Mathieu-Daudé --- hw/intc/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index fac2d228f9b..377de78bb41 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -45,10 +45,10 @@ specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c')) arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c')) arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) -specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) +specific_ss.add(when: ['CONFIG_WHPX', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_hvf.c')) stub_ss.add(files('arm_gicv3_hvf_stub.c')) -specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) +specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c')) -- 2.53.0