{"id":2222753,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222753/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260413152326.63738-10-mohamed@unpredictable.fr/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260413152326.63738-10-mohamed@unpredictable.fr>","date":"2026-04-13T15:23:21","name":"[v10,09/14] whpx: i386: disable kernel-irqchip on Windows 10 when PIC enabled","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4c52cea858ed54c38b42b962ea42d6aeb03f3cd3","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/1.1/people/91318/?format=json","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260413152326.63738-10-mohamed@unpredictable.fr/mbox/","series":[{"id":499721,"url":"http://patchwork.ozlabs.org/api/1.1/series/499721/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499721","date":"2026-04-13T15:23:12","name":"whpx: i386: bug fixes, feature probing and CPUID","version":10,"mbox":"http://patchwork.ozlabs.org/series/499721/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222753/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222753/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=unpredictable.fr header.i=@unpredictable.fr\n header.a=rsa-sha256 header.s=sig1 header.b=Uja94aSO;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fvWRG54GRz1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 14 Apr 2026 01:24:26 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wCJ90-00064Y-Po; Mon, 13 Apr 2026 11:24:10 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <mohamed@unpredictable.fr>)\n id 1wCJ8h-0005Yb-Jb\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 11:23:54 -0400","from qs-2005k-snip4-2.eps.apple.com ([57.103.86.233]\n helo=outbound.qs.icloud.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <mohamed@unpredictable.fr>)\n id 1wCJ8f-0000Uv-4V\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 11:23:50 -0400","from outbound.qs.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-east-2d-100-percent-10 (Postfix) with ESMTPS id\n 34C4218000AF; Mon, 13 Apr 2026 15:23:43 +0000 (UTC)","from localhost.localdomain (unknown [17.57.155.37])\n by p00-icloudmta-asmtp-us-east-2d-100-percent-10 (Postfix) with ESMTPSA id\n 0D68F180009E; Mon, 13 Apr 2026 15:23:41 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1776093827; x=1778685827;\n bh=UDUDDhSNImOkwjgegNmDYFGV0Ws4YLT0V61YNwqVXjA=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=Uja94aSOJEquuuQVQ8/jtaeEFPYubNBAJthoHXjuTjkH1Xq2/ZsnznO0sQuKunSBTybe/6rsxAgll+ROpEUX+divTGmCjZmqO9r10EIMx1IhtLbRthMfEIkMiKNN5qoK/C0tv/Mxud8Spkgq362PSPVrWN5Y575eOUBkQtat0O130s3EvSAka1Ob9ifRked+htop6OgjUGMjyW3xy2giWYDIN2mSS0vv7ShXGSkVrgrVg2Dhs0466anJSIWxZVr3Pdn1PgUjovVbQu6XtxzPYg4lNrsI22j7vx8Bg9Une4Ce3bcw2uOEP2fQ1Gy0DGSEip6m1ObCrdhTRxgVIlRE+g==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni <mohamed@unpredictable.fr>","To":"qemu-devel@nongnu.org","Cc":"Zhao Liu <zhao1.liu@intel.com>, \"Michael S. Tsirkin\" <mst@redhat.com>,\n Paolo Bonzini <pbonzini@redhat.com>, Wei Liu <wei.liu@kernel.org>,\n Roman Bolshakov <rbolshakov@ddn.com>,\n Pedro Barbuda <pbarbuda@microsoft.com>,\n Mohamed Mediouni <mohamed@unpredictable.fr>,\n Phil Dennis-Jordan <phil@philjordan.eu>","Subject":"[PATCH v10 09/14] whpx: i386: disable kernel-irqchip on Windows 10\n when PIC enabled","Date":"Mon, 13 Apr 2026 17:23:21 +0200","Message-ID":"<20260413152326.63738-10-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260413152326.63738-1-mohamed@unpredictable.fr>","References":"<20260413152326.63738-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-ORIG-GUID":"D-4RY6il9eKIem7RH8Zju7hLiVxOme4C","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDEzMDE1MSBTYWx0ZWRfX6xeykMPdZj1u\n Ijp2bFt/xn/M/1pjIZJsAGqzoKnsjiXHDrCiAbKuyKgeAn9fDpSDMQfLnQh7Zu9dUsqMKgpSpNh\n ZAQzRAHIuaRnBrT1tB2eiYRzhp6N1MI3Slvs3U7/tT1b+OUS1HO7tYnmE9WclysbxOKQtUwNzOQ\n mGizs0Tl0S+QT7OtTBnlwKt+hqkDi0Yw49DQ7A0jivtJwhI5nHT/3UMt4Zi7A7ZMpxxzdMIy67a\n okf5yCQHF4xFcFzfiR3SyFELpB1P34S/LB1VW/60emd14MKX3afVKMoAx3QG/S4FNruSwN2T2m1\n OzqOfi3GwXXzjmY461HiMmRjFAY/xWkTYuPaQcNKjsvJkyC1vV5UxeTCFOu7FI=","X-Proofpoint-GUID":"D-4RY6il9eKIem7RH8Zju7hLiVxOme4C","X-Authority-Info-Out":"v=2.4 cv=DohbOW/+ c=1 sm=1 tr=0 ts=69dd0a81\n cx=c_apl:c_pps:t_out a=bsP7O+dXZ5uKcj+dsLqiMw==:117\n a=bsP7O+dXZ5uKcj+dsLqiMw==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22\n a=nUl_a9z44qMLw6SsMv4A:9","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-13_03,2026-04-13_04,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0\n lowpriorityscore=0 clxscore=1030 mlxlogscore=801 adultscore=0 mlxscore=0\n spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 suspectscore=0\n classifier=spam authscore=0 adjust=0 reason=mlx scancount=1\n engine=8.22.0-2601150000 definitions=main-2604130151","Received-SPF":"pass client-ip=57.103.86.233;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n 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 <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Move WHvCapabilityCodeProcessorPerfmonFeatures queries\nas that's how we distinguish if on a legacy OS.\n\nNow that Windows guests are booting, disable kernel-irqchip=on\nby default for Windows 10 when the PIC is enabled.\n\nSigned-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\n---\n target/i386/whpx/whpx-all.c | 69 +++++++++++++++++++++----------------\n 1 file changed, 39 insertions(+), 30 deletions(-)","diff":"diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex 74b94b799e..7c80d653d1 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2447,6 +2447,13 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n         0x8000000A, 0x80000021, 0x80000022, 0xC0000000, 0xC0000001};\n     UINT32 cpuidExitList_legacy_os[] = {1, 0x40000000, 0x40000001, 0x40000010};\n \n+    X86MachineState *x86ms = X86_MACHINE(ms);\n+    bool pic_enabled = false;\n+\n+    if (x86ms->pic == ON_OFF_AUTO_ON || x86ms->pic == ON_OFF_AUTO_AUTO) {\n+        pic_enabled = true;\n+    }\n+\n     whpx = &whpx_global;\n \n     if (!init_whp_dispatch()) {\n@@ -2518,6 +2525,35 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n         goto error;\n     }\n \n+    /* Enable supported performance monitoring capabilities */\n+    hr = whp_dispatch.WHvGetCapability(\n+        WHvCapabilityCodeProcessorPerfmonFeatures, &perfmon_features,\n+        sizeof(WHV_PROCESSOR_PERFMON_FEATURES), &whpx_cap_size);\n+    /*\n+     * Relying on this is a crutch to maintain Windows 10 support.\n+     *\n+     * WHvCapabilityCodeProcessorPerfmonFeatures and\n+     * WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks\n+     * are implemented starting from Windows Server 2022 (build 20348).\n+     */\n+    if (FAILED(hr)) {\n+        warn_report(\"WHPX: Failed to get performance \"\n+                    \"monitoring features, hr=%08lx\", hr);\n+        is_modern_os = false;\n+    } else {\n+        hr = whp_dispatch.WHvSetPartitionProperty(\n+                whpx->partition,\n+                WHvPartitionPropertyCodeProcessorPerfmonFeatures,\n+                &perfmon_features,\n+                sizeof(WHV_PROCESSOR_PERFMON_FEATURES));\n+        if (FAILED(hr)) {\n+            error_report(\"WHPX: Failed to set performance \"\n+                         \"monitoring features, hr=%08lx\", hr);\n+            ret = -EINVAL;\n+            goto error;\n+        }\n+    }\n+\n     /*\n      * Error out if WHP doesn't support apic emulation and user is requiring\n      * it.\n@@ -2530,8 +2566,9 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n         goto error;\n     }\n \n-    if (whpx->kernel_irqchip_allowed && features.LocalApicEmulation &&\n-        whp_dispatch.WHvSetVirtualProcessorInterruptControllerState2) {\n+    if (whpx->kernel_irqchip_allowed && !(whpx_is_legacy_os() && pic_enabled\n+        && !whpx->kernel_irqchip_required) && features.LocalApicEmulation\n+        && whp_dispatch.WHvSetVirtualProcessorInterruptControllerState2) {\n         WHV_X64_LOCAL_APIC_EMULATION_MODE mode =\n             WHvX64LocalApicEmulationModeX2Apic;\n         hr = whp_dispatch.WHvSetPartitionProperty(\n@@ -2590,34 +2627,6 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n         goto error;\n     }\n \n-    /* Enable supported performance monitoring capabilities */\n-    hr = whp_dispatch.WHvGetCapability(\n-        WHvCapabilityCodeProcessorPerfmonFeatures, &perfmon_features,\n-        sizeof(WHV_PROCESSOR_PERFMON_FEATURES), &whpx_cap_size);\n-    /*\n-     * Relying on this is a crutch to maintain Windows 10 support.\n-     *\n-     * WHvCapabilityCodeProcessorPerfmonFeatures and\n-     * WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks\n-     * are implemented starting from Windows Server 2022 (build 20348).\n-     */\n-    if (FAILED(hr)) {\n-        warn_report(\"WHPX: Failed to get performance \"\n-                    \"monitoring features, hr=%08lx\", hr);\n-        is_modern_os = false;\n-    } else {\n-        hr = whp_dispatch.WHvSetPartitionProperty(\n-                whpx->partition,\n-                WHvPartitionPropertyCodeProcessorPerfmonFeatures,\n-                &perfmon_features,\n-                sizeof(WHV_PROCESSOR_PERFMON_FEATURES));\n-        if (FAILED(hr)) {\n-            error_report(\"WHPX: Failed to set performance \"\n-                         \"monitoring features, hr=%08lx\", hr);\n-            ret = -EINVAL;\n-            goto error;\n-        }\n-    }\n \n     /* Enable synthetic processor features */\n     WHV_SYNTHETIC_PROCESSOR_FEATURES_BANKS synthetic_features;\n","prefixes":["v10","09/14"]}