{"id":2219590,"url":"http://patchwork.ozlabs.org/api/patches/2219590/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260403142446.36964-10-mohamed@unpredictable.fr/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260403142446.36964-10-mohamed@unpredictable.fr>","list_archive_url":null,"date":"2026-04-03T14:24:46","name":"[v5,9/9] whpx: i386: disable kernel-irqchip on Windows 10 when PIC enabled","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f37192b2c6d54b3993b382ec8da5eac7b63de7ce","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/people/91318/?format=json","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260403142446.36964-10-mohamed@unpredictable.fr/mbox/","series":[{"id":498635,"url":"http://patchwork.ozlabs.org/api/series/498635/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=498635","date":"2026-04-03T14:24:37","name":"whpx: i386: bug fixes, feature probing and CPUID","version":5,"mbox":"http://patchwork.ozlabs.org/series/498635/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219590/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219590/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=KdMohnYM;\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=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.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 4fnLcy29txz1xtJ\n\tfor ; Sat, 04 Apr 2026 01:26:26 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1w8fSl-0005OW-6H; Fri, 03 Apr 2026 10:25:31 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1w8fSe-0005Nm-1V\n for qemu-devel@nongnu.org; Fri, 03 Apr 2026 10:25:24 -0400","from p-east2-cluster2-host12-snip4-10.eps.apple.com ([57.103.78.103]\n helo=outbound.st.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 )\n id 1w8fSY-0000O1-HK\n for qemu-devel@nongnu.org; Fri, 03 Apr 2026 10:25:21 -0400","from outbound.st.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-east-1a-100-percent-6 (Postfix) with ESMTPS id\n D208718038E5; Fri, 03 Apr 2026 14:25:16 +0000 (UTC)","from localhost.localdomain (unknown [17.42.251.67])\n by p00-icloudmta-asmtp-us-east-1a-100-percent-6 (Postfix) with ESMTPSA id\n 0E7F21800F95; Fri, 03 Apr 2026 14:25:01 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1775226317; x=1777818317;\n bh=I1qIMF60/hdkMQjsW/iuFcTfVIViRyblz4VLoxCPh1s=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=KdMohnYMzbkyD9mRvcZKaVs7NhmYIbaWNr0NF+5/4XVnQGwjSby/nSnrjgCsWBx/l/tFAHYfG8U9N4HST9gb9gqWknWDuy34S5f58If+d+3FZPhCyKTbkT26wdWkN1qY288y6PYLqDxmjEAyfYPxI3FSkfRNJn4N/RtxOktrDo8l7sCdKilD/UGGfDG24rMeBy+NmY/T29FYpXFKv87ft/wWDkdVcBDZKm14iK+HcJoWOP974DJsY6KA2v5pt5ai2uVCw4DYVisz9OVUhB/8exI48J1BFu4twtg12ny9f+2+onjPVjkEjOKyyCj7OG/uJCDyJWOE+y+Me/g5Yoj2mw==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni ","To":"qemu-devel@nongnu.org","Cc":"Phil Dennis-Jordan ,\n Mohamed Mediouni ,\n Paolo Bonzini , Zhao Liu ,\n Pedro Barbuda , Wei Liu ,\n Roman Bolshakov ","Subject":"[PATCH v5 9/9] whpx: i386: disable kernel-irqchip on Windows 10 when\n PIC enabled","Date":"Fri, 3 Apr 2026 16:24:46 +0200","Message-ID":"<20260403142446.36964-10-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260403142446.36964-1-mohamed@unpredictable.fr>","References":"<20260403142446.36964-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-GUID":"NZxShgZWVreMbW83qpNZaUa3RuZE4RQq","X-Proofpoint-ORIG-GUID":"NZxShgZWVreMbW83qpNZaUa3RuZE4RQq","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAzMDEyOCBTYWx0ZWRfX4w2eBApmVK9J\n og/ftEKxYvjJwTGp/YnE39mAOdHfmRXLgDRIsqbnzB3zlLu5dqlYjBImDcEKQmPuLkuL8B6/qqZ\n 0WTYHVbUxDIATPbMhDYGWftVCkMmZftulohYFLWxPMTLfAkgrh5pnHn7wR/7zVUTKV0XTxKti48\n M8q9Y2PV1JUYP2UD5ZR0umzyw8OHBPWkBcW0qNbzpYNzstDIMUsOhfsbXmKOeShy7Wt/zPcLQW0\n r3EqSpi5l/jdYlepno9v6rzlNvky9+YjjyMYvW/wuQaFKgbXh2QVT8pYXZzNkikrSU69jeFbVeR\n mTZtOkkmS6Zbvl2TPguPOzXyVh3aPacnufb4VHg1p2TtXVYG5yNODA+6PIp8tU=","X-Authority-Info-Out":"v=2.4 cv=X8pf6WTe c=1 sm=1 tr=0 ts=69cfcdcd\n cx=c_apl:c_pps:t_out a=YrL12D//S6tul8v/L+6tKg==:117\n a=YrL12D//S6tul8v/L+6tKg==: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-03_04,2026-04-03_01,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 mlxlogscore=816\n clxscore=1030 malwarescore=0 spamscore=0\n adultscore=0 mlxscore=0 phishscore=0\n bulkscore=0 lowpriorityscore=0 suspectscore=0 classifier=spam authscore=0\n adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604030128","Received-SPF":"pass client-ip=57.103.78.103;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.st.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_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 ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","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 \n---\n target/i386/whpx/whpx-all.c | 70 +++++++++++++++++++++----------------\n 1 file changed, 40 insertions(+), 30 deletions(-)","diff":"diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex db2e85514c..b8ef636c09 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -22,6 +22,7 @@\n #include \"qemu/main-loop.h\"\n #include \"hw/core/boards.h\"\n #include \"hw/intc/ioapic.h\"\n+#include \"hw/i386/x86.h\"\n #include \"hw/i386/apic_internal.h\"\n #include \"qemu/error-report.h\"\n #include \"qapi/error.h\"\n@@ -2354,6 +2355,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@@ -2425,6 +2433,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@@ -2437,8 +2474,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@@ -2497,34 +2535,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":["v5","9/9"]}