{"id":2219740,"url":"http://patchwork.ozlabs.org/api/patches/2219740/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260404042015.86580-11-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":"<20260404042015.86580-11-mohamed@unpredictable.fr>","list_archive_url":null,"date":"2026-04-04T04:20:14","name":"[v6,10/11] 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/20260404042015.86580-11-mohamed@unpredictable.fr/mbox/","series":[{"id":498696,"url":"http://patchwork.ozlabs.org/api/series/498696/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=498696","date":"2026-04-04T04:20:05","name":"whpx: i386: bug fixes, feature probing and CPUID","version":6,"mbox":"http://patchwork.ozlabs.org/series/498696/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219740/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219740/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=Kd8IR2QC;\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 4fnj9D3GRzz1yD3\n\tfor ; Sat, 04 Apr 2026 15:22:08 +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 1w8sUz-0006q6-7G; Sat, 04 Apr 2026 00:20:41 -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 1w8sUv-0006hz-72\n for qemu-devel@nongnu.org; Sat, 04 Apr 2026 00:20:37 -0400","from p-east2-cluster5-host3-snip4-10.eps.apple.com ([57.103.79.53]\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 1w8sUt-00065v-Hi\n for qemu-devel@nongnu.org; Sat, 04 Apr 2026 00:20:36 -0400","from outbound.st.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-east-1a-10-percent-0 (Postfix) with ESMTPS id\n 9B7C0180015F; Sat, 04 Apr 2026 04:20:33 +0000 (UTC)","from localhost.localdomain (unknown [17.42.251.67])\n by p00-icloudmta-asmtp-us-east-1a-10-percent-0 (Postfix) with ESMTPSA id\n E2D881800148; Sat, 04 Apr 2026 04:20:31 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1775276434; x=1777868434;\n bh=E/wpGyb3DZbr7iRgDlSLmIZF0LoYRPnCZNdh3d/mGug=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=Kd8IR2QCP/vcHJD5ETxhRFRu2JMF0XbBMwEtSY/JWScar25D1yNuh8Hh8n88NuvvZyGF2L8kgyTEvouvtM4nEV45AxpLsgxnCLHKYfoXKXEh+5sF02l6aHeeqQDOB8KasE7wC7/EKDNBJ953dMIAAx/rX5UjnoB630mhxMgV/BTPumDtpQ5SoiFXvWWfv17aJYa8mAJ70pi9yR86wUmd61Q4JcVWCewbY65fuZomA7HMEoRTyC7ep9095RmBWNWQxbSdi81ioY0cDVBGXGVotRjddAQMvjdbYOYM5TvFstnicO6iau2d1rdQAYvNmJX4Axzw/h7EP/N+dynykaHVFA==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni ","To":"qemu-devel@nongnu.org","Cc":"Wei Liu , Roman Bolshakov ,\n Pedro Barbuda ,\n Mohamed Mediouni ,\n Phil Dennis-Jordan ,\n Paolo Bonzini , Zhao Liu ","Subject":"[PATCH v6 10/11] whpx: i386: disable kernel-irqchip on Windows 10\n when PIC enabled","Date":"Sat, 4 Apr 2026 06:20:14 +0200","Message-ID":"<20260404042015.86580-11-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260404042015.86580-1-mohamed@unpredictable.fr>","References":"<20260404042015.86580-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Authority-Info-Out":"v=2.4 cv=KoJAGGWN c=1 sm=1 tr=0 ts=69d09192\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-GUID":"oCgxOMM7HVUiBVl1j2SIaR8AhPViqkfM","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDA0MDAzNCBTYWx0ZWRfXwpw2D+LIyOak\n QT4twuTNY8bln2EXsyzVgsd8MEpMqiPjekbDMGW5pLpu71cAfV9OY+mTCfPvBu4VmjL396kHAiw\n GMg19Utgtwj4SFm8M1TkcMXJS9dc1/esfkp1nLiFZQjy+OXzNv0apFZADvvkPdSy4OtfXmANdyK\n +tDkimFwjae1ymvJSaDnE2lDFWZfJBgnPdLOcNEhuYFDmkptu8Ej4rQ7sTDIX3rOZE42vOA6Y2B\n LDYV6yITLIHqPTbnbJfirb9CyfKPipDn1riBgT8R9blpuBI7QzslGbblSb1HS4JBupAWI7+637o\n DTn0PKjEqnTSsQJjTPksH7C1Nxq1tNr+1yY5tAji4k4VpEltJEFDdVAThNHpco=","X-Proofpoint-ORIG-GUID":"oCgxOMM7HVUiBVl1j2SIaR8AhPViqkfM","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_07,2026-04-03_01,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 malwarescore=0\n mlxscore=0 phishscore=0 mlxlogscore=816\n clxscore=1030 lowpriorityscore=0\n spamscore=0 bulkscore=0 adultscore=0 suspectscore=0 classifier=spam\n authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604040034","Received-SPF":"pass client-ip=57.103.79.53;\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 a3e91ca533..4810b6387d 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@@ -2362,6 +2363,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@@ -2433,6 +2441,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@@ -2445,8 +2482,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@@ -2505,34 +2543,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":["v6","10/11"]}