{"id":2219739,"url":"http://patchwork.ozlabs.org/api/patches/2219739/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260404042015.86580-7-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-7-mohamed@unpredictable.fr>","list_archive_url":null,"date":"2026-04-04T04:20:10","name":"[v6,06/11] whpx: i386: reintroduce enlightenments for Windows 10","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ec7de59d4f0eece1a63bdae7514f5f3d203a10eb","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-7-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/2219739/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219739/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=JfMqjns9;\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 4fnj9C3wrLz1yD3\n\tfor ; Sat, 04 Apr 2026 15:22:07 +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 1w8sUx-0006kb-DV; Sat, 04 Apr 2026 00:20:39 -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 1w8sUq-0006gM-Sl\n for qemu-devel@nongnu.org; Sat, 04 Apr 2026 00:20:33 -0400","from p-east2-cluster5-host8-snip4-2.eps.apple.com ([57.103.79.35]\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 1w8sUn-00064m-O0\n for qemu-devel@nongnu.org; Sat, 04 Apr 2026 00:20:31 -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 0BAF9180016C; Sat, 04 Apr 2026 04:20:27 +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 4D6321800097; Sat, 04 Apr 2026 04:20:26 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1775276429; x=1777868429;\n bh=GZdCCmgVqW23HX+mjz2AnzpVTE0NCr1pVAykO8WLeqw=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=JfMqjns9H7kz/zq7rdq5+covg2r/wVt5vqsiszkAIMXPuyx8q+X7CY/bAmu6Dvos0lQu+bESpZViyAsZ0IvEWHkQ2S2x2ODT7aRotzLovxScJ8m3FTWuFQOWFdAkspdP10zJFzYYchjaY1xDdMsm2Ryaw7uc3oE7t7ItY43N++aZFjU+xD7/U6WCLPTRibzfNa0reWrO5lM8YQz5so5mcEZH4bUjo6J+EByNnqkwt4Tq0TLIE7KWMlGUqIS7M3H8bEwV03aggjON/hw7qhv6dAv4O0/S5Bjro4aTJMcy5KS9V+ooBGlXqXwAELfJp2c6e9UWXKh/sogYrhGp1WMLrg==","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 06/11] whpx: i386: reintroduce enlightenments for Windows\n 10","Date":"Sat, 4 Apr 2026 06:20:10 +0200","Message-ID":"<20260404042015.86580-7-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":"ifxx8sbsAUgWZK6yYGjgyif3lWMQ9_5b","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDA0MDAzNCBTYWx0ZWRfX1sWYKWcl3gWi\n 8aerXlBAv8PQhqtkqKG7vxoyiLUJxWKX8z7+B7N45urIWKMinfKsvEXOq1PoC+vbmsms5iylghu\n iKQqUgb85Yu2kU8Ww9oQjpFfGwdlKzkATufMjm8jh9CrZ9I8WrCfRupvW1fNY9Z+fXpTXSkjQaO\n 2wKIwFu4At+A4ML5nRPG1cKDiH0Tiarutj91jSYaoECgT1HDiz+BD2LeebD8a9MWU8fNLekvgzo\n LqOEiOfDLIvj5niAfVoQImxUKUkzo3HVwjit7w/lwwUkEwPCAa8tMTZ06LwvQ7BWfkh957q4ttj\n PibhUUU0hC2qPBw8xq21zCyHRUf5lvnQ7X3OXRXcfU2+sXt24XJcDdsPqv3xCY=","X-Authority-Info-Out":"v=2.4 cv=UoNu9uwB c=1 sm=1 tr=0 ts=69d0918c\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=1av6p83xj7LwzDHaJJEA:9","X-Proofpoint-GUID":"ifxx8sbsAUgWZK6yYGjgyif3lWMQ9_5b","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 clxscore=1030\n phishscore=0 spamscore=0 adultscore=0 malwarescore=0 bulkscore=0\n mlxlogscore=999 mlxscore=0 suspectscore=0 lowpriorityscore=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.35;\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_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001,\n 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":"Was removed in 2c08624 but it's still useful for\nWindows 10 so reintroduce it there.\n\nAnd this time, actually make it work by reporting\nthe hypervisor bit in CPUID.\n\nAlso pretend to be KVM, with the only capability\nreported being X2APIC support.\n\nAlthough looks like Linux doesn't use that vmware leaf...\n\nSigned-off-by: Mohamed Mediouni \n---\n accel/whpx/whpx-common.c | 2 ++\n include/system/whpx-internal.h | 1 +\n target/arm/whpx/whpx-all.c | 1 +\n target/i386/whpx/whpx-all.c | 55 ++++++++++++++++++++++++++++------\n 4 files changed, 50 insertions(+), 9 deletions(-)","diff":"diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c\nindex b813a5d9d2..59be996aef 100644\n--- a/accel/whpx/whpx-common.c\n+++ b/accel/whpx/whpx-common.c\n@@ -550,6 +550,8 @@ static void whpx_accel_instance_init(Object *obj)\n \n whpx->hyperv_enlightenments_allowed = true;\n whpx->hyperv_enlightenments_required = false;\n+ /* Value determined at whpx_accel_init */\n+ whpx->hyperv_enlightenments_enabled = false;\n }\n \n static const TypeInfo whpx_accel_type = {\ndiff --git a/include/system/whpx-internal.h b/include/system/whpx-internal.h\nindex 5902124b63..cf782cf5f8 100644\n--- a/include/system/whpx-internal.h\n+++ b/include/system/whpx-internal.h\n@@ -45,6 +45,7 @@ struct whpx_state {\n \n bool hyperv_enlightenments_allowed;\n bool hyperv_enlightenments_required;\n+ bool hyperv_enlightenments_enabled;\n \n };\n \ndiff --git a/target/arm/whpx/whpx-all.c b/target/arm/whpx/whpx-all.c\nindex bbf0f6be96..4019a513aa 100644\n--- a/target/arm/whpx/whpx-all.c\n+++ b/target/arm/whpx/whpx-all.c\n@@ -968,6 +968,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n * as they're not needed for performance.\n */\n if (whpx->hyperv_enlightenments_required) {\n+ whpx->hyperv_enlightenments_enabled = true;\n hr = whp_dispatch.WHvSetPartitionProperty(\n whpx->partition,\n WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks,\ndiff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex 66f263558f..03233d1b94 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2083,14 +2083,49 @@ int whpx_vcpu_run(CPUState *cpu)\n vcpu->exit_ctx.VpContext.Rip +\n vcpu->exit_ctx.VpContext.InstructionLength;\n \n- reg_values[1].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRax;\n- reg_values[2].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRcx;\n- reg_values[3].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRdx;\n- reg_values[4].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRbx;\n-\n- if (vcpu->exit_ctx.CpuidAccess.Rax == 1) {\n- if (cpu_has_x2apic_feature(env)) {\n- reg_values[2].Reg64 |= CPUID_EXT_X2APIC;\n+ if (whpx_is_legacy_os()) {\n+ reg_values[1].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRax;\n+ reg_values[2].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRcx;\n+ reg_values[3].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRdx;\n+ reg_values[4].Reg64 = vcpu->exit_ctx.CpuidAccess.DefaultResultRbx;\n+ } else {\n+ cpu_x86_cpuid(env, vcpu->exit_ctx.CpuidAccess.Rax,\n+ vcpu->exit_ctx.CpuidAccess.Rcx,\n+ (UINT32 *)®_values[1].Reg32,\n+ (UINT32 *)®_values[4].Reg32, (UINT32 *)®_values[2].Reg32,\n+ (UINT32 *)®_values[3].Reg32);\n+ }\n+\n+ if (!whpx->hyperv_enlightenments_enabled) {\n+ switch (vcpu->exit_ctx.CpuidAccess.Rax) {\n+ case 1:\n+ if (cpu_has_x2apic_feature(env)) {\n+ reg_values[2].Reg64 |= CPUID_EXT_X2APIC;\n+ }\n+ reg_values[2].Reg64 |= CPUID_EXT_HYPERVISOR;\n+ break;\n+ case 0x40000000:\n+ /* report KVM */\n+ if (x86_cpu->vmware_cpuid_freq) {\n+ reg_values[1].Reg64 = 0x40000010;\n+ } else {\n+ reg_values[1].Reg64 = 0x40000001;\n+ }\n+ reg_values[4].Reg64 = 0x4b4d564b;\n+ reg_values[2].Reg64 = 0x564b4d56;\n+ reg_values[3].Reg64 = 0x4d;\n+ break;\n+ case 0x40000001:\n+ /* report X2APIC */\n+ reg_values[1].Reg64 = reg_values[4].Reg64 =\n+ reg_values[2].Reg64 = 1 << 15;\n+ break;\n+ case 0x40000010:\n+ if (x86_cpu->vmware_cpuid_freq) {\n+ reg_values[1].Reg64 = env->tsc_khz;\n+ reg_values[4].Reg64 = env->apic_bus_freq / 1000; /* Hz to KHz */\n+ }\n+ break;\n }\n }\n \n@@ -2311,6 +2346,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n WHV_PROCESSOR_FEATURES_BANKS processor_features;\n WHV_PROCESSOR_PERFMON_FEATURES perfmon_features;\n UINT32 cpuidExitList[] = {1};\n+ UINT32 cpuidExitList_nohyperv[] = {1, 0x40000000, 0x40000001, 0x40000010};\n \n whpx = &whpx_global;\n \n@@ -2513,6 +2549,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n }\n \n if (is_modern_os && whpx->hyperv_enlightenments_allowed) {\n+ whpx->hyperv_enlightenments_enabled = true;\n hr = whp_dispatch.WHvSetPartitionProperty(\n whpx->partition,\n WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks,\n@@ -2565,7 +2602,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n hr = whp_dispatch.WHvSetPartitionProperty(\n whpx->partition,\n WHvPartitionPropertyCodeCpuidExitList,\n- cpuidExitList,\n+ whpx->hyperv_enlightenments_enabled ? cpuidExitList : cpuidExitList_nohyperv,\n RTL_NUMBER_OF(cpuidExitList) * sizeof(UINT32));\n \n if (FAILED(hr)) {\n","prefixes":["v6","06/11"]}