{"id":2226945,"url":"http://patchwork.ozlabs.org/api/patches/2226945/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422214225.2242-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":"<20260422214225.2242-7-mohamed@unpredictable.fr>","list_archive_url":null,"date":"2026-04-22T21:41:54","name":"[v3,06/37] whpx: i386: reintroduce enlightenments for Windows 10","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"67133efb55a6f5b9bdfc3fbc41be29f09b1128d9","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/20260422214225.2242-7-mohamed@unpredictable.fr/mbox/","series":[{"id":501116,"url":"http://patchwork.ozlabs.org/api/series/501116/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501116","date":"2026-04-22T21:41:48","name":"[v3,01/37] target/i386: emulate: include name of unhandled instruction","version":3,"mbox":"http://patchwork.ozlabs.org/series/501116/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226945/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226945/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=HV9zMv3S;\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 4g1CWM6lRzz1yD5\n\tfor ; Thu, 23 Apr 2026 07:47:43 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFfLO-0007ww-GY; Wed, 22 Apr 2026 17:42:50 -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 )\n id 1wFfLM-0007va-QQ\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 17:42:48 -0400","from p-east2-cluster1-host5-snip4-8.eps.apple.com ([57.103.76.91]\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 1wFfLK-0006z8-WD\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 17:42:48 -0400","from outbound.st.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPS id\n 1B131180097E; Wed, 22 Apr 2026 21:42:41 +0000 (UTC)","from localhost.localdomain (unknown [17.42.251.67])\n by p00-icloudmta-asmtp-us-east-1a-100-percent-1 (Postfix) with ESMTPSA id\n 6E5F018000C7; Wed, 22 Apr 2026 21:42:39 +0000 (UTC)"],"X-ICL-Out-Info":"\n HUtFAUMHWwJACUgBTUQeDx5WFlZNRAJCTQFIHV8DWRxBAUkdXw9LVxQEFVwFVgZXFHkNXR1FDlYZWgxSD1sOHBZLWFUJCgZdGFgVVgl3HlwASx1XBFQfUxJVHR0LRUtAEwRJAU1fDl4fBBdGGVUERx5dVkAZGQJRHFYNV0NUBF9QSQxBUGxaAEcXSB1dGVlvUF0cDhhZG0AVXRFQGVYJXhUXHkFNWgJWTQVKA18BWwZCC0oCWQVZB14LSgdfGlwfHVYQUgBSD3IFVwhBCFMCUQRYGl8IGQ1AThkMSh1SVlEFSgxcAGgPXR1YEV0=","Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1776894166; x=1779486166;\n bh=hkQG6hOmkKoQQ4VfPKcZK5YN5+VU0E/MubeBjGkQBBQ=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=HV9zMv3So4Y0mJwBIOC7ZlYdnjGoCAdOyTv9t7dpf3LuIvvPGpP6VTuyL7n4F8ex55BDHFZtlHJJoyNl+fQ97znFqLlyvUVedPc/sNCujmek+LqYx2o6so9DuWnFd+eWPIjSeOinVZgYdiDrQiN4M4PfKXnuzN602s8L1A5s9Jd4BzzhPnv4Dl0wfGyfaJ+6QsUdjjCcj2jm+p6j2lGaHev5qNG6+NB2eq/uRWqpFSbVaZy6RuUEZIYCzlDPx1lrBrqeLfezG7imjWhrHEITZaKGp8DxGnt8Wnf2BuO+e/+5XtayprEDJOQCHf0bMTJbtVodlg4Gqupky8zbo8Ruqw==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni ","To":"qemu-devel@nongnu.org","Cc":"Pedro Barbuda , qemu-arm@nongnu.org,\n Pierrick Bouvier ,\n Mohamed Mediouni ,\n Roman Bolshakov ,\n \"Michael S. Tsirkin\" , Wei Liu ,\n Phil Dennis-Jordan ,\n Peter Maydell , Zhao Liu ,\n Paolo Bonzini ","Subject":"[PATCH v3 06/37] whpx: i386: reintroduce enlightenments for Windows\n 10","Date":"Wed, 22 Apr 2026 23:41:54 +0200","Message-ID":"<20260422214225.2242-7-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260422214225.2242-1-mohamed@unpredictable.fr>","References":"<20260422214225.2242-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-GUID":"pHMhze96HKbChHZ4pNipe3sOb9aB1OHK","X-Authority-Info-Out":"v=2.4 cv=TtLrRTXh c=1 sm=1 tr=0 ts=69e940d3\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=hfWBbujXMTx1PmRkPVYA:9","X-Proofpoint-ORIG-GUID":"pHMhze96HKbChHZ4pNipe3sOb9aB1OHK","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDIyMDIxMSBTYWx0ZWRfX4Y10kmJax19L\n NeAdQfEOjJhNwWwSLmU5PnJAPs1nUtZAhQw8Q+JQryNxdbQ0xP9g+s9H+bLeVVUabKxd80Pmbob\n hvi4FGiiy5wzz0h2Oo0ECrD58sPUtEnLsbByBi0SoPmAI7lwSphV8xAw4Bu+BuuH67Bx1TYB/F1\n wn6xv+focXtqLFUHajmVKeicojN/mwci1JHZB+97GjSaDubZ8YFrNY83e42DOyeJB8We7F1cmAg\n 2y/jYbTB9Ji0TCi/KdrxisZds15GgKGVjneEK+jp0u7YUrWp6drvwxv94ksHc4lDvj1djDoZDAl\n nYusF5vK/xKSobhmq/W+2GBszIdmm9Amotr2AXCqOWXpUSa/VtzUUUZw8ynKEY=","Received-SPF":"pass client-ip=57.103.76.91;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.st.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 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\nPretend to be vmware to be able to use vmport's functionality.\n\nIf the vmware frequency leaf is disabled, pretend to be\nKVM, with the only capability reported being X2APIC support.\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 | 63 +++++++++++++++++++++++++++++-----\n 4 files changed, 58 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 4954e0557a..f9f330c038 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -2168,14 +2168,57 @@ 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+ reg_values[2].Reg64 |= CPUID_EXT_HYPERVISOR;\n+ break;\n+ case 0x40000000:\n+ /*\n+ * Use vmware_cpuid_freq as a proxy to report VMware.\n+ * This is to get the TSC/APIC frequency query functionality\n+ * provided through vmport, as Linux doesn't use leaf\n+ * 0x40000010 for getting those frequencies.\n+ */\n+ if (x86_cpu->vmware_cpuid_freq) {\n+ reg_values[1].Reg64 = 0x40000010;\n+ reg_values[4].Reg64 = 0x61774d56;\n+ reg_values[2].Reg64 = 0x4d566572;\n+ reg_values[3].Reg64 = 0x65726177;\n+ } else {\n+ /* report KVM otherwise if that's disabled */\n+ reg_values[1].Reg64 = 0x40000001;\n+ reg_values[4].Reg64 = 0x4b4d564b;\n+ reg_values[2].Reg64 = 0x564b4d56;\n+ reg_values[3].Reg64 = 0x4d;\n+ }\n+ break;\n+ case 0x40000001:\n+ if (!x86_cpu->vmware_cpuid_freq) {\n+ /* KVM reporting of X2APIC support */\n+ reg_values[1].Reg64 = reg_values[4].Reg64 =\n+ reg_values[2].Reg64 = 1 << 15;\n+ }\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@@ -2396,6 +2439,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@@ -2601,6 +2645,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@@ -2653,7 +2698,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":["v3","06/37"]}