{"id":2219736,"url":"http://patchwork.ozlabs.org/api/patches/2219736/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260404042015.86580-9-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-9-mohamed@unpredictable.fr>","list_archive_url":null,"date":"2026-04-04T04:20:12","name":"[v6,08/11] whpx: i386: kernel-irqchip=off fixes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3a79a7069d6046948fd981ca441395f76f891fc1","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-9-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/2219736/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219736/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=J75GRisS;\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 4fnj8n6Fjmz1yD3\n\tfor ; Sat, 04 Apr 2026 15:21:45 +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 1w8sUy-0006ms-QQ; Sat, 04 Apr 2026 00:20:40 -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-0006hx-72\n for qemu-devel@nongnu.org; Sat, 04 Apr 2026 00:20:37 -0400","from p-east2-cluster5-host2-snip4-7.eps.apple.com ([57.103.79.20]\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-00065m-DL\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 4A3E618000BA; Sat, 04 Apr 2026 04:20:31 +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 1FBBC180016F; Sat, 04 Apr 2026 04:20:29 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1775276434; x=1777868434;\n bh=gR8Ib7lXF8/u6lw5vo+4E3Ws12mo9iE1CDhgrlQLJb4=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=J75GRisSPsqN2//DUmWq6XuUFhdd86bNUc9wWUieBP8I4L5gtNZSPZaXxfFnzxlLHDCwHPuxKnAJEslZ38rYYmIJNGbeiEecEsj4kRzh/a/OvuuY1YixrPRO/qtYRbSuCrr8UaWpZiOkKyntu47zauUXjP7PqixW3DlVX9qhRE32FOtpZPyS683nnLAsMSaECkb0eOgEgv/ZVxzTV5fdiXjbfZUNVR7iPutxER8CSc30v2z1U5gr007fQyDu6XdszL2+Cwn2Ofv9BLkBw4kzGKPKaape83AmJy2Sy9OIMH8Xw7Woh8U1tRSG7sN/FmvqNhDVfLqJqpD9OmVwmPl1Zg==","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 08/11] whpx: i386: kernel-irqchip=off fixes","Date":"Sat, 4 Apr 2026 06:20:12 +0200","Message-ID":"<20260404042015.86580-9-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-Proofpoint-ORIG-GUID":"zwvKUYTFGv3MLkOOmrDquI6heT1hybuO","X-Authority-Info-Out":"v=2.4 cv=J+2nLQnS c=1 sm=1 tr=0 ts=69d09190\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=csJb2AmPZwjbM2O5LjEA:9","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDA0MDAzNCBTYWx0ZWRfXytIek+2UqFI7\n OyykFb5z8hAofNlY1awP9daoH81v8IBl3zS3m4XeBB2iTQIL5B2XkcauNnYFwRKVe0SswloxiIw\n n4qsIP4hE718coJSqH5eYlzn/4N4SYBPruWOqtDJtPkAe/Jr9289KGcLnuYmP/AGSDQkVVbyxlW\n PNYyOVscYBOnKV0clt9aewf6PBvS+xiXrXJ9EE0OlQhDEpdTebe32emJW6TE5RHJLb8YUa0hcY0\n 1kggIuiignjYWrX6XzYMCaxEOtiU3J2ls2RrVEtTtEClZJ2C3S84gQo5eHo5LSkvx4/A9a87L3s\n MukilbCAd1B+RUBEnhU8yr0sypVblxRlYGrVaxK1fhE99HVkvW1q/67dyzLZiY=","X-Proofpoint-GUID":"zwvKUYTFGv3MLkOOmrDquI6heT1hybuO","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\n lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0\n mlxscore=0 suspectscore=0 clxscore=1030 mlxlogscore=999 phishscore=0\n classifier=spam authscore=0 adjust=0 reason=mlx scancount=1\n engine=8.22.0-2601150000 definitions=main-2604040034","Received-SPF":"pass client-ip=57.103.79.20;\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_H2=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":"This was really... quite broken. After fixing this,\nWindows boots with kernel-irqchip=off.\n\nSigned-off-by: Mohamed Mediouni \n---\n include/system/whpx-common.h | 1 +\n target/i386/whpx/whpx-all.c | 54 ++++++++++--------------------------\n 2 files changed, 15 insertions(+), 40 deletions(-)","diff":"diff --git a/include/system/whpx-common.h b/include/system/whpx-common.h\nindex 04289afd97..3406c20fec 100644\n--- a/include/system/whpx-common.h\n+++ b/include/system/whpx-common.h\n@@ -4,6 +4,7 @@\n \n struct AccelCPUState {\n bool window_registered;\n+ int window_priority;\n bool interruptable;\n bool ready_for_pic_interrupt;\n uint64_t tpr;\ndiff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex 3e006496be..97284b954b 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -371,28 +371,6 @@ static int whpx_set_tsc(CPUState *cpu)\n return 0;\n }\n \n-/*\n- * The CR8 register in the CPU is mapped to the TPR register of the APIC,\n- * however, they use a slightly different encoding. Specifically:\n- *\n- * APIC.TPR[bits 7:4] = CR8[bits 3:0]\n- *\n- * This mechanism is described in section 10.8.6.1 of Volume 3 of Intel 64\n- * and IA-32 Architectures Software Developer's Manual.\n- *\n- * The functions below translate the value of CR8 to TPR and vice versa.\n- */\n-\n-static uint64_t whpx_apic_tpr_to_cr8(uint64_t tpr)\n-{\n- return tpr >> 4;\n-}\n-\n-static uint64_t whpx_cr8_to_apic_tpr(uint64_t cr8)\n-{\n- return cr8 << 4;\n-}\n-\n void whpx_set_registers(CPUState *cpu, WHPXStateLevel level)\n {\n struct whpx_state *whpx = &whpx_global;\n@@ -421,7 +399,7 @@ void whpx_set_registers(CPUState *cpu, WHPXStateLevel level)\n v86 = (env->eflags & VM_MASK);\n r86 = !(env->cr[0] & CR0_PE_MASK);\n \n- vcpu->tpr = whpx_apic_tpr_to_cr8(cpu_get_apic_tpr(x86_cpu->apic_state));\n+ vcpu->tpr = cpu_get_apic_tpr(x86_cpu->apic_state);\n vcpu->apic_base = cpu_get_apic_base(x86_cpu->apic_state);\n \n idx = 0;\n@@ -692,17 +670,6 @@ void whpx_get_registers(CPUState *cpu, WHPXStateLevel level)\n hr);\n }\n \n- if (whpx_irqchip_in_kernel()) {\n- /*\n- * Fetch the TPR value from the emulated APIC. It may get overwritten\n- * below with the value from CR8 returned by\n- * WHvGetVirtualProcessorRegisters().\n- */\n- whpx_apic_get(x86_cpu->apic_state);\n- vcpu->tpr = whpx_apic_tpr_to_cr8(\n- cpu_get_apic_tpr(x86_cpu->apic_state));\n- }\n-\n idx = 0;\n \n /* Indexes for first 16 registers match between HV and QEMU definitions */\n@@ -751,7 +718,7 @@ void whpx_get_registers(CPUState *cpu, WHPXStateLevel level)\n tpr = vcxt.values[idx++].Reg64;\n if (tpr != vcpu->tpr) {\n vcpu->tpr = tpr;\n- cpu_set_apic_tpr(x86_cpu->apic_state, whpx_cr8_to_apic_tpr(tpr));\n+ cpu_set_apic_tpr(x86_cpu->apic_state, tpr);\n }\n \n /* 8 Debug Registers - Skipped */\n@@ -1605,6 +1572,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)\n UINT32 reg_count = 0;\n WHV_REGISTER_VALUE reg_values[3];\n WHV_REGISTER_NAME reg_names[3];\n+ int irr = apic_get_highest_priority_irr(x86_cpu->apic_state);\n \n memset(&new_int, 0, sizeof(new_int));\n memset(reg_values, 0, sizeof(reg_values));\n@@ -1643,7 +1611,8 @@ static void whpx_vcpu_pre_run(CPUState *cpu)\n /* Get pending hard interruption or replay one that was overwritten */\n if (!whpx_irqchip_in_kernel()) {\n if (!vcpu->interruption_pending &&\n- vcpu->interruptable && (env->eflags & IF_MASK)) {\n+ vcpu->interruptable && (env->eflags & IF_MASK)\n+ && (irr == -1 || vcpu->tpr < irr)) {\n assert(!new_int.InterruptionPending);\n if (cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD)) {\n cpu_reset_interrupt(cpu, CPU_INTERRUPT_HARD);\n@@ -1690,7 +1659,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)\n }\n \n /* Sync the TPR to the CR8 if was modified during the intercept */\n- tpr = whpx_apic_tpr_to_cr8(cpu_get_apic_tpr(x86_cpu->apic_state));\n+ tpr = cpu_get_apic_tpr(x86_cpu->apic_state);\n if (tpr != vcpu->tpr) {\n vcpu->tpr = tpr;\n reg_values[reg_count].Reg64 = tpr;\n@@ -1700,13 +1669,18 @@ static void whpx_vcpu_pre_run(CPUState *cpu)\n }\n \n /* Update the state of the interrupt delivery notification */\n- if (!vcpu->window_registered &&\n+ if ((!vcpu->window_registered || vcpu->window_priority < irr) &&\n cpu_test_interrupt(cpu, CPU_INTERRUPT_HARD)) {\n+ if (irr == -1) {\n+ irr = 0;\n+ }\n reg_values[reg_count].DeliverabilityNotifications =\n (WHV_X64_DELIVERABILITY_NOTIFICATIONS_REGISTER) {\n- .InterruptNotification = 1\n+ .InterruptNotification = 1,\n+ .InterruptPriority = irr\n };\n vcpu->window_registered = 1;\n+ vcpu->window_priority = irr;\n reg_names[reg_count] = WHvX64RegisterDeliverabilityNotifications;\n reg_count += 1;\n }\n@@ -1737,7 +1711,7 @@ static void whpx_vcpu_post_run(CPUState *cpu)\n if (vcpu->tpr != tpr) {\n vcpu->tpr = tpr;\n bql_lock();\n- cpu_set_apic_tpr(x86_cpu->apic_state, whpx_cr8_to_apic_tpr(vcpu->tpr));\n+ cpu_set_apic_tpr(x86_cpu->apic_state, vcpu->tpr);\n bql_unlock();\n }\n \n","prefixes":["v6","08/11"]}