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 lists.gnu.org (lists.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 909A0CCF9EE for ; Wed, 29 Oct 2025 17:40:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEA5V-0003a9-Di; Wed, 29 Oct 2025 13:35:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEA5Q-0003X3-5L for qemu-devel@nongnu.org; Wed, 29 Oct 2025 13:35:52 -0400 Received: from p-east2-cluster1-host4-snip4-7.eps.apple.com ([57.103.76.20] helo=outbound.st.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEA5D-0003KN-JO for qemu-devel@nongnu.org; Wed, 29 Oct 2025 13:35:51 -0400 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-60-percent-10 (Postfix) with ESMTPS id 91F111824481; Wed, 29 Oct 2025 17:35:24 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=7XXwlHQPk/SKyuEJ63acz+SZiCgkqqjnl8cfroXHjPg=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=JKJck4u2Sz3djwtc+HDA8mU9+X4svex+u/RdWLyKvJm6qsxqETxOw6hLDax+ybxeYuISLX7sWVkZGU4HDPfRFgndXooQQYCDhYz/3lGa5FJRjR8vYptDaZ05xfJRx7sWZumZ3PttQM/3PrM2CkkuQQ1kMqWQctA37/7iHzWhWsB08xLibiNsUk9v8YLuZQyKKfDxYUluA+vRi8F3XRZEuWzdd3ajKg+PELloLEj1g9cCG13OmkHcG/ILLdKpwHf9Aut8s4FX3+JVJxjFkMV2IgYf35WR5uABGSx8C45T0rYioigf5Na6bOR5ix/4GC1VCtbYzmB1hAJV9FfJQ800cQ== mail-alias-created-date: 1752046281608 Received: from mac.home (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-60-percent-10 (Postfix) with ESMTPSA id DEC86185B011; Wed, 29 Oct 2025 16:55:33 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Pedro Barbuda , Paolo Bonzini , qemu-arm@nongnu.org, Alexander Graf , Peter Maydell , Phil Dennis-Jordan , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PATCH v10 10/28] hw, target, accel: whpx: change apic_in_platform to kernel_irqchip Date: Wed, 29 Oct 2025 17:54:52 +0100 Message-ID: <20251029165510.45824-11-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251029165510.45824-1-mohamed@unpredictable.fr> References: <20251029165510.45824-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: N3qpuN_2zxUP4gbvPd-3fij3TdJmOd3X X-Proofpoint-ORIG-GUID: N3qpuN_2zxUP4gbvPd-3fij3TdJmOd3X X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDI5MDE0MCBTYWx0ZWRfX1jKzzcqT4zRJ 28RcUAvz9bYdOuJAEF+/FRROoRcy3nB1pqO4WaHXQ3C3/nZAgYnGv9iNSTStBF0moLw3dIVxuga 7TREmzee5WeC4VCnrPPuluU2CYC/SEAvd/le+nDqB3U4RdxDGaLkTsbp/3GDgs65XYTsnH1i+YL U0ssqlxeJ9IIsizQozqo5kasv2w1+qjEbl5LKeUiygoj4mMPgg6Sq5RIw/YJeoCBygReNwebXSM xTFFD1G78LvhGFBlcWgN0Zdg6SJnbo0gBf7NODpPvLst7ZYlIpFV/HV7UuxM4cNnDeSIpZ2+M= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-10-29_07,2025-10-29_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=833 malwarescore=0 suspectscore=0 adultscore=0 clxscore=1030 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510290140 X-JNJ: AAAAAAABJMn7clLHS3bVCE3GP/7PfgGpkTh3WCR4SxJKxW9uEeKnOw2ZKLEDxJIVKsYx+iWgnSrhjRKVi+PvdqU7JP5pCA9GFy+SZVAePKl7oaKmX18MEWnbqOGJWUIcf6/GgBb1bDBeSqH8ZvcZlZyvNrFxw5bQW+GD+zd60SCrzqo9hcA8LgsGN5quGwBwGJLr7JlLht0T5s30bEiMkWjjK1ioKMcnnvZOkkkSwexHl+bDJUJjbBB6mLAbgeh/DxjDH0aFSjjdBU1X4XOeX9OiRiYf2Z2+b6fra1WlqXnzyicamerO05h/sjPDKLojuLFE94hI/9bmcfXT91leumbnwXKtV/ismY3M846m806jqEhHYnWQTUZs34qV01gGCKp/W6GtmUua8EULYSWH7apRrK9eGEtAyj36x6a55cm2VFPasMDBEp7jvCxEiV10JyUZBL7FcAMmrIKv5+Uu1xnsPXcmNF0voI9YBBc1Qn0HCgZqE/wJSnlHE4Wr4WJNhRBmk/4zZSDsDW+j07hBT4v7F47U9wwm0lK2tOLbFciXQxBjOYdZcTBVimkBMsUyTFw4DCbZdeSMrrNf2g5NwPuC5tQHgCcjh+OHsZ5fJu0GbAd/ikVChsmLcTiy1G+xNJYm7KwX9Cf6zyOBFVfGu3n8Y5YwLeeWV/93EosgwVerNR6Zz4Y2MsSFS89Pd1+RJTCufBvxSuIXbBxwjZY2n4XDynBXkYPLrXYXVoN0afUBwEJUf7wWuLtzZxKnbJ7vGTwhU8jWhfgbdUvhsfHfZZWkMLnkY1S4RV0e3V772Q== Received-SPF: pass client-ip=57.103.76.20; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Change terminology to match the KVM one, as APIC is x86-specific. Signed-off-by: Mohamed Mediouni Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/whpx/whpx-accel-ops.c | 2 +- accel/whpx/whpx-common.c | 4 ++-- hw/i386/x86-cpu.c | 4 ++-- include/system/whpx-internal.h | 2 +- include/system/whpx.h | 4 ++-- target/i386/cpu-apic.c | 2 +- target/i386/whpx/whpx-all.c | 14 +++++++------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/accel/whpx/whpx-accel-ops.c b/accel/whpx/whpx-accel-ops.c index c84a25c273..50fadea0fd 100644 --- a/accel/whpx/whpx-accel-ops.c +++ b/accel/whpx/whpx-accel-ops.c @@ -78,7 +78,7 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) static bool whpx_vcpu_thread_is_idle(CPUState *cpu) { - return !whpx_apic_in_platform(); + return !whpx_irqchip_in_kernel(); } static void whpx_accel_ops_class_init(ObjectClass *oc, const void *data) diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index c0ff6cacb8..18d93225c1 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -496,9 +496,9 @@ static const TypeInfo whpx_cpu_accel_type = { * Partition support */ -bool whpx_apic_in_platform(void) +bool whpx_irqchip_in_kernel(void) { - return whpx_global.apic_in_platform; + return whpx_global.kernel_irqchip; } static void whpx_accel_class_init(ObjectClass *oc, const void *data) diff --git a/hw/i386/x86-cpu.c b/hw/i386/x86-cpu.c index 1a86a853d5..aee7fc76f5 100644 --- a/hw/i386/x86-cpu.c +++ b/hw/i386/x86-cpu.c @@ -45,7 +45,7 @@ static void pic_irq_request(void *opaque, int irq, int level) trace_x86_pic_interrupt(irq, level); if (cpu_is_apic_enabled(cpu->apic_state) && !kvm_irqchip_in_kernel() && - !whpx_apic_in_platform()) { + !whpx_irqchip_in_kernel()) { CPU_FOREACH(cs) { cpu = X86_CPU(cs); if (apic_accept_pic_intr(cpu->apic_state)) { @@ -71,7 +71,7 @@ int cpu_get_pic_interrupt(CPUX86State *env) X86CPU *cpu = env_archcpu(env); int intno; - if (!kvm_irqchip_in_kernel() && !whpx_apic_in_platform()) { + if (!kvm_irqchip_in_kernel() && !whpx_irqchip_in_kernel()) { intno = apic_get_interrupt(cpu->apic_state); if (intno >= 0) { return intno; diff --git a/include/system/whpx-internal.h b/include/system/whpx-internal.h index 4565436682..81c0c1819f 100644 --- a/include/system/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -44,7 +44,7 @@ struct whpx_state { bool kernel_irqchip_allowed; bool kernel_irqchip_required; - bool apic_in_platform; + bool kernel_irqchip; }; extern struct whpx_state whpx_global; diff --git a/include/system/whpx.h b/include/system/whpx.h index 00f6a3e523..98fe045ba1 100644 --- a/include/system/whpx.h +++ b/include/system/whpx.h @@ -26,10 +26,10 @@ #ifdef CONFIG_WHPX_IS_POSSIBLE extern bool whpx_allowed; #define whpx_enabled() (whpx_allowed) -bool whpx_apic_in_platform(void); +bool whpx_irqchip_in_kernel(void); #else /* !CONFIG_WHPX_IS_POSSIBLE */ #define whpx_enabled() 0 -#define whpx_apic_in_platform() (0) +#define whpx_irqchip_in_kernel() (0) #endif /* !CONFIG_WHPX_IS_POSSIBLE */ #endif /* QEMU_WHPX_H */ diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index 564c1288e4..c0492035b8 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -32,7 +32,7 @@ APICCommonClass *apic_get_class(Error **errp) apic_type = "kvm-apic"; } else if (xen_enabled()) { apic_type = "xen-apic"; - } else if (whpx_apic_in_platform()) { + } else if (whpx_irqchip_in_kernel()) { apic_type = "whpx-apic"; } diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index c63bb28b20..d778e358f6 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -607,7 +607,7 @@ void whpx_get_registers(CPUState *cpu) hr); } - if (whpx_apic_in_platform()) { + if (whpx_irqchip_in_kernel()) { /* * Fetch the TPR value from the emulated APIC. It may get overwritten * below with the value from CR8 returned by @@ -749,7 +749,7 @@ void whpx_get_registers(CPUState *cpu) assert(idx == RTL_NUMBER_OF(whpx_register_names)); - if (whpx_apic_in_platform()) { + if (whpx_irqchip_in_kernel()) { whpx_apic_get(x86_cpu->apic_state); } @@ -1379,7 +1379,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) } /* Get pending hard interruption or replay one that was overwritten */ - if (!whpx_apic_in_platform()) { + if (!whpx_irqchip_in_kernel()) { if (!vcpu->interruption_pending && vcpu->interruptable && (env->eflags & IF_MASK)) { assert(!new_int.InterruptionPending); @@ -1553,7 +1553,7 @@ int whpx_vcpu_run(CPUState *cpu) if (exclusive_step_mode == WHPX_STEP_NONE) { whpx_vcpu_process_async_events(cpu); - if (cpu->halted && !whpx_apic_in_platform()) { + if (cpu->halted && !whpx_irqchip_in_kernel()) { cpu->exception_index = EXCP_HLT; qatomic_set(&cpu->exit_request, false); return 0; @@ -1642,7 +1642,7 @@ int whpx_vcpu_run(CPUState *cpu) break; case WHvRunVpExitReasonX64ApicEoi: - assert(whpx_apic_in_platform()); + assert(whpx_irqchip_in_kernel()); ioapic_eoi_broadcast(vcpu->exit_ctx.ApicEoi.InterruptVector); break; @@ -2187,7 +2187,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } } else { - whpx->apic_in_platform = true; + whpx->kernel_irqchip = true; } } @@ -2196,7 +2196,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms) prop.ExtendedVmExits.X64MsrExit = 1; prop.ExtendedVmExits.X64CpuidExit = 1; prop.ExtendedVmExits.ExceptionExit = 1; - if (whpx_apic_in_platform()) { + if (whpx_irqchip_in_kernel()) { prop.ExtendedVmExits.X64ApicInitSipiExitTrap = 1; } -- 2.50.1 (Apple Git-155)