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 8CDF4D73E84 for ; Thu, 29 Jan 2026 19:22:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vlXaC-0007Cv-Sa; Thu, 29 Jan 2026 14:21:38 -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 1vlXZa-0006Ws-7o for qemu-devel@nongnu.org; Thu, 29 Jan 2026 14:21:01 -0500 Received: from ci-2007a-snip4-7.eps.apple.com ([57.103.88.10] helo=outbound.ci.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vlXZY-00063F-AM for qemu-devel@nongnu.org; Thu, 29 Jan 2026 14:20:58 -0500 Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-100-percent-2 (Postfix) with ESMTPS id CCCAB18005F7; Thu, 29 Jan 2026 19:20:52 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1769714455; x=1772306455; bh=JwG09taZNQZEUrnety/DLmIDMJ9+cgWSAONaI1A1Ms0=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=YjZugXx0HwoVLkGLh3bu4JFC3S41K4QkbINItH9EldzcNKRqM8QbC/UmypBUzWkrtidx93AKr/6vdMcO2Dw16RZDpKbKipRElxRGgzojMifW/nhyx7jB9NqTdP4KGh7AZiNlGwt/EqgyFMD0IzxNHI9XYw5bvR4mbYxXlpkqXLdKdVl/ahJr8Ad+r5u7wPXZXRXD/K4CdPZxi7HEe7wzSGuGh+gK1Q845Q21kW5DncDvc80oXdAymU2UtJCJ5+9/ZtX+RS9RMgRhAWJJlfuKD+eTX712AUPuF1iJjNVv17QlQgsbCVKcLlHWZ+0pdYQvYb5FNkhugukIXQP0fF22Lw== mail-alias-created-date: 1752046281608 Received: from localhost.localdomain (unknown [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-100-percent-2 (Postfix) with ESMTPSA id 74F6118018A7; Thu, 29 Jan 2026 19:20:49 +0000 (UTC) From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Pierrick Bouvier , Akihiko Odaki , Phil Dennis-Jordan , Shannon Zhao , Zhao Liu , Eduardo Habkost , Igor Mammedov , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cameron Esfahani , "Michael S. Tsirkin" , qemu-arm@nongnu.org, Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Pedro Barbuda , Peter Maydell , Marcel Apfelbaum Subject: [PATCH v19 12/22] hw, target, accel: whpx: change apic_in_platform to kernel_irqchip Date: Thu, 29 Jan 2026 20:19:57 +0100 Message-ID: <20260129192009.14707-13-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260129192009.14707-1-mohamed@unpredictable.fr> References: <20260129192009.14707-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: ViAPSSdmElja3MYcDkJLgiPOcvyarqVF X-Proofpoint-ORIG-GUID: ViAPSSdmElja3MYcDkJLgiPOcvyarqVF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI5MDEzOCBTYWx0ZWRfXwzS3LqppuDdr YBbeUxJHkkC+a9ACx1krbjYzDJnYv0+31i9giW47zqDb85R7m/gYcpgGFZA9jdySM8v1KPbeBis zh5FUhDP7a1O8NVAaD0E8vpBQHnP+vcyBiNYPPkwomKCpW8yQwnLgc0M2qRKkc4jXb6cV6nRU/U I+8p83LT7kVKBj/4dllXlb9iK5p9S2wziKnDiZztTkJXaFzEVbVHI1bcg2i06qrLK7t/yQbgwBp yLJN9wMSCavZTIRJ+5beXxfgFy7zofPbQv9B9v3dAPxKwzTBErCZGSwFgvvrC+ul+VGP6Kp1Wkp qAjCbDU/Uka8zlK13PHo+YSOCrMtBtJ0bj8dVzBXtsw6qXD+NKRENcYT+TQJNo= X-Authority-Info-Out: v=2.4 cv=OOoqHCaB c=1 sm=1 tr=0 ts=697bb316 cx=c_apl:c_apl_out:c_pps a=2G65uMN5HjSv0sBfM2Yj2w==:117 a=2G65uMN5HjSv0sBfM2Yj2w==:17 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=ogbMO5OAvhA2mBZm2BUA:9 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-29_03,2026-01-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 lowpriorityscore=0 clxscore=1030 adultscore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 spamscore=0 malwarescore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601290138 X-JNJ: AAAAAAABkZsWQWJ94bSYlXzeXcLtKK/UFFVuGpr6Iwl/hPbrvdnAN8bpFSWgt2LrtBmeKehBr4sw7eff8JTiZncqJxS7jBRGGwAfLue4qxYY4co9ZJYCRVLZ5Ttatqw6Jtl5cAmyHiKlBgA8KQIc4Jh2vm65XAJrpulmjxpZtFZDJ+nBylsQdbz9mwB8oaaZGtWU9RZFH+iM6PFYZo5L8XNq6z/YJXYKEqb3sEEQveFIYFH4FnqolB7yYAN0/VcHDzT2kVnqSGjUD8ggZyd3OAqANuEB4CgGoOTn94YE6H65+HUz6NZl+VyJiuGkHsuQIH0SN+/dDqPlwuxzSM3yRmEUd8iVXLwr/d4b+5k9G4PY6acRJzc9y3AF4YteuqfYE4SJ7hqpjGKCBbEA1veyNeEyWTy61Y3Lh8R2+3JWBGUW6snniOgbuEktGIbV3GhJ91gmsmxRUOR/mid26GJiRsU9FewVzWUHbYq6FDTyDKJwPNq9GlIrzykOiekLzGt8TGfwsv3/8z+xvBU8qpJ8cqaIcfL8jxiSaOMAFw3CDUD5KPcow/DfcKu2foCA4NCfxSZv75hKOna23QToO/m0q6XmFIWI+mHLspllY4NW1DAA/VxpUL6au72sJmelhDxtnA5k6Js2+reDfGhv6QzM7vg5q7RYEyL2eTWfPSYiDg0ETIpbxgYwYHhFoyhhhOYOqmI1XxX3hnNMNfoGUBSNQjOXWUzUH3YGLHz/UeZSQuHGhWShB1uW7HI4s2WtKpdKde9LpFkA6zm46yPP8z6rpMHySVyYy7p1Ll5ljP4IUnXYNRI5+DJ9Wnr6P9PLYvEyhF/OyI/AKJt++7CXGNCdEbLthk4mya3PEgF7sydEgdFko0BFFYLWDw== Received-SPF: pass client-ip=57.103.88.10; envelope-from=mohamed@unpredictable.fr; helo=outbound.ci.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: 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 Change terminology to match the KVM one, as APIC is x86-specific. And move out whpx_irqchip_in_kernel() to make it usable from common code even when not compiling with WHPX support. Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier Reviewed-by: Akihiko Odaki --- accel/stubs/whpx-stub.c | 1 + accel/whpx/whpx-accel-ops.c | 2 +- accel/whpx/whpx-common.c | 10 +--------- hw/i386/x86-cpu.c | 4 ++-- include/system/whpx-internal.h | 1 - include/system/whpx.h | 5 +++-- target/i386/cpu-apic.c | 2 +- target/i386/whpx/whpx-all.c | 14 +++++++------- 8 files changed, 16 insertions(+), 23 deletions(-) diff --git a/accel/stubs/whpx-stub.c b/accel/stubs/whpx-stub.c index c564c89fd0..4529dc4f78 100644 --- a/accel/stubs/whpx-stub.c +++ b/accel/stubs/whpx-stub.c @@ -10,3 +10,4 @@ #include "system/whpx.h" bool whpx_allowed; +bool whpx_irqchip_in_kernel; 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 c0610815d9..05f9e520b7 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -35,6 +35,7 @@ #include bool whpx_allowed; +bool whpx_irqchip_in_kernel; static bool whp_dispatch_initialized; static HMODULE hWinHvPlatform; #ifdef HOST_X86_64 @@ -488,15 +489,6 @@ static const TypeInfo whpx_cpu_accel_type = { .abstract = true, }; -/* - * Partition support - */ - -bool whpx_apic_in_platform(void) -{ - return whpx_global.apic_in_platform; -} - static void whpx_accel_class_init(ObjectClass *oc, const void *data) { AccelClass *ac = ACCEL_CLASS(oc); diff --git a/hw/i386/x86-cpu.c b/hw/i386/x86-cpu.c index 276f2b0cdf..95e08e3c2a 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 609d0e1c08..8ded54a39b 100644 --- a/include/system/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -45,7 +45,6 @@ struct whpx_state { bool kernel_irqchip_allowed; bool kernel_irqchip_required; - bool apic_in_platform; }; extern struct whpx_state whpx_global; diff --git a/include/system/whpx.h b/include/system/whpx.h index 00f6a3e523..4217a27e91 100644 --- a/include/system/whpx.h +++ b/include/system/whpx.h @@ -25,11 +25,12 @@ #ifdef CONFIG_WHPX_IS_POSSIBLE extern bool whpx_allowed; +extern bool whpx_irqchip_in_kernel; #define whpx_enabled() (whpx_allowed) -bool whpx_apic_in_platform(void); +#define whpx_irqchip_in_kernel() (whpx_irqchip_in_kernel) #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 eeee62b52a..50a2b8ae86 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 052cda42bf..8210250dc3 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_irqchip_in_kernel = 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)