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 20A54CFA76A for ; Fri, 21 Nov 2025 10:05:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMNzw-0004wC-1j; Fri, 21 Nov 2025 05:04:13 -0500 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 1vMNzU-0004ha-N7 for qemu-arm@nongnu.org; Fri, 21 Nov 2025 05:03:45 -0500 Received: from p-east3-cluster3-host6-snip4-10.eps.apple.com ([57.103.86.63] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMNzH-0007tx-OQ for qemu-arm@nongnu.org; Fri, 21 Nov 2025 05:03:42 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-4 (Postfix) with ESMTPS id 18A0118000A9; Fri, 21 Nov 2025 10:03:02 +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=VCN+W8G+xiIKiq1HjPLGcZq16mpKVk/A0VsQTzkeQkJ81Y+fqp3SyTXpJWhotIvwxixG1N1XtT/uvb3bvuLaNt8ifmHbgVvPb6EWjEc1LFouXrpF2xVhUfQjMcMiMFqdJPFS2gNfEDn6RfOkD9J6lZt29dbw/Ro8QXCiWrbduYpSuu9HULj8mHXPmNpK1VCHUYrZ9CwVBNMB48cQfJQyojfAlbnoqmzEZoNCfnejLtZsqa1cahyGTcGAQLMpzsr3ltxqQj/LUByipozOR2cdgWXvoaVw9RejhskMiqpnAuV6GzVKnv5znTXe8LaJLpB33GijJFtGy/qs1jrgbMmrxA== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-4 (Postfix) with ESMTPSA id 44BFB18010F4; Fri, 21 Nov 2025 10:03:00 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Graf , Peter Maydell , Phil Dennis-Jordan , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-arm@nongnu.org, Pedro Barbuda , Akihiko Odaki , Peter Xu , Mads Ynddal , Richard Henderson , Pierrick Bouvier Subject: [PATCH v11 10/28] hw, target, accel: whpx: change apic_in_platform to kernel_irqchip Date: Fri, 21 Nov 2025 11:02:22 +0100 Message-ID: <20251121100240.89117-11-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251121100240.89117-1-mohamed@unpredictable.fr> References: <20251121100240.89117-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTIxMDA3NiBTYWx0ZWRfXxGQaRkVd6fV0 FGUynPb4hfBd06Se7bGsfZqvq79jR5Oxv4d3fYg8qeG/UgxZe73bwLbdHKD/m3MjEC70/cQ7cRS f8PANl5+ruTS+8KS6YoAgqLkpNqlY2k1l7sU+m4iEet3kSVAwy652iyZ8laIj+Kwo4Vx/l40S1a dxdRpDC/jVbsMdKBmHc7Ht8ny/mgbJZkjgLuRG8m0XCRkacshxHyiTq3vQ+oyzvZZWMviA8RUF0 DpRdGJ8JczfGuNKSn8SgaKIq6ptSuLyvna7LLog/oTFD5og/wqGueLFE1RTtErf4/sA/NcHKS4p /YCgohgO6GgfQWyIC82 X-Authority-Info: v=2.4 cv=Gt1PO01C c=1 sm=1 tr=0 ts=692038d9 cx=c_apl:c_pps a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=ogbMO5OAvhA2mBZm2BUA:9 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: VKk6s9yJcW_xCEBBcQEgdkAFNcFHoNHV X-Proofpoint-ORIG-GUID: VKk6s9yJcW_xCEBBcQEgdkAFNcFHoNHV 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-11-21_03,2025-11-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxlogscore=965 adultscore=0 spamscore=0 clxscore=1030 mlxscore=0 suspectscore=0 phishscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2511210076 X-JNJ: AAAAAAAB2AUjxSXRPtNcUVnRGV6Pbs5wNoUYbWNDk8o+hAa7g03geCmmvT9ft6gEkc85IyFmMreARWFlDAvRbi9aYlBKwsFCpiCcA1N8WZzAZnXK/8pGjxyP9b0wkFODm+febXcZ5Sax+Kgkd5jYdhcgzNDFa+EI5ZpMSjchBBeDcSPEKaVfajQ60g+OmiP/FoAMQwBAqSR0bYV2IXJSx/wMsbQYvM+nj2tsYNBDYZZ6+X+n+hNt53gzQ/VajDCUr3kA8sLd2yBltq1lwewIT6Fg0azwABLaF4SO7JyWKR8zOPt4OpfKzcYpESBiE+9JjsG1Rm42qxc+gVN6xL8si0VMPOmxzsQhLY109cZ3r48FRKGGSJ0MyJP/xWCz+qxx3zzoXAGmM/N/CUDdKoWLlSsVL/5EXMDVskDZLaUx6E7S3rhQoiS1p6+5UeN4za4Ev446+2a1me7gUpYsWdYRD3YTU94jNkTG8lUqk6dJ1VKtgHKkZaT68ZjWM0qWe1j7wbRi9F/VUX7zH+2uuZZFCZ1a7kGXaGaGKV4XVPmpAYRQ7y9KX7/JGDjrmaI6ZyfUEJD602HYuSp+/pBcUYGk5lkyDVIlVvtWkjy/O0eR8mdBc+PrhgyDwJ95fEVE4TcImQfDAKpleJbtinHnIg8gRGg8MbUh5ry9M/1OQL1Hh6zln72RffASUC+d4HxIQZFjDXcuDlJ1dP7ixy6G3119GpJRAfUoONChlmmtfh3TMQ5AK5rEifilbqKcf5om1RcVKK37YSOZiaFzjhIsw6e1uZshsA== Received-SPF: pass client-ip=57.103.86.63; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.icloud.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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=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)