Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2219593/?format=api
{ "id": 2219593, "url": "http://patchwork.ozlabs.org/api/patches/2219593/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260403142446.36964-4-mohamed@unpredictable.fr/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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-4-mohamed@unpredictable.fr>", "list_archive_url": null, "date": "2026-04-03T14:24:40", "name": "[v5,3/9] whpx: i386: wire up feature probing", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "0547db4fdb7870114b92541ecfb89efbed6bdb77", "submitter": { "id": 91318, "url": "http://patchwork.ozlabs.org/api/people/91318/?format=api", "name": "Mohamed Mediouni", "email": "mohamed@unpredictable.fr" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260403142446.36964-4-mohamed@unpredictable.fr/mbox/", "series": [ { "id": 498635, "url": "http://patchwork.ozlabs.org/api/series/498635/?format=api", "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/2219593/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2219593/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=HfUzeEKE;\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 4fnLdV3LLHz1yDH\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 04 Apr 2026 01:26:54 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1w8fSO-00059a-5M; Fri, 03 Apr 2026 10:25:08 -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 <mohamed@unpredictable.fr>)\n id 1w8fSN-00059Q-2E\n for qemu-devel@nongnu.org; Fri, 03 Apr 2026 10:25:07 -0400", "from p-east2-cluster6-host1-snip4-10.eps.apple.com ([57.103.76.181]\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 <mohamed@unpredictable.fr>)\n id 1w8fSL-0000AO-12\n for qemu-devel@nongnu.org; Fri, 03 Apr 2026 10:25:06 -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 46A931800FA3; Fri, 03 Apr 2026 14:25:01 +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 754371800FAC; Fri, 03 Apr 2026 14:24:53 +0000 (UTC)" ], "Dkim-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1775226304; x=1777818304;\n bh=Ash1yi3VlTyxdP0Aar5CNwwUDY+XErFVJjyfbU7EpDA=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=HfUzeEKEU1mTQxqKn11yITpJ6uQNFP61DcwN9KjA9PFpZUw5+M/iF1Icn4bgC1yals8UXQl6UurXMRFSA3PhGpgsZecrYEMVH/hDxpB/nDQqY25AKX3prabqOYTPhSssw2E++z/Hnu/eJ5cYhrHYXXF6qnkl55kbN22bytg9DoCIO4MQCSdhBQ42KpnXGdNNcA5khAzoayTWKCe0+t+xaS1TbfFvWI5/syn57eTWwJhgsFRhBCENhzPcRBuKITB7LVCauFMm4K5CcjCu7UcmjgooqXFgCdk7N5WdXVh813poKx1RRrS7lLPwHrrWRRk9IPBQ19rRGRz7x3ic2Bw0PQ==", "mail-alias-created-date": "1752046281608", "From": "Mohamed Mediouni <mohamed@unpredictable.fr>", "To": "qemu-devel@nongnu.org", "Cc": "Phil Dennis-Jordan <phil@philjordan.eu>,\n Mohamed Mediouni <mohamed@unpredictable.fr>,\n Paolo Bonzini <pbonzini@redhat.com>, Zhao Liu <zhao1.liu@intel.com>,\n Pedro Barbuda <pbarbuda@microsoft.com>, Wei Liu <wei.liu@kernel.org>,\n Roman Bolshakov <rbolshakov@ddn.com>", "Subject": "[PATCH v5 3/9] whpx: i386: wire up feature probing", "Date": "Fri, 3 Apr 2026 16:24:40 +0200", "Message-ID": "<20260403142446.36964-4-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-Spam-Details-Enc": "AW1haW4tMjYwNDAzMDEyOCBTYWx0ZWRfX+2zGkuSr9m1r\n AYiiRPkfSEOYJLCofrZC3GFRvYnIU+OTkXkk8RxISpoNAqhGKQuB+7tGaromwEiiek3eoK36hZ4\n WP6vI/qga7k94ChftjTo/zftiUIsOQQr2WpTc1WZouKwYDQ3YmlysQ7VdphXxgAFcVxSNA0zoa2\n wZUNwFHTDSD/tGbXXjqWrpY1ezyiyUJNCZIuOSq/wiGAfeo+8CTy+tNcP8IKbmFyVtj2YQnz7pi\n Xnh+h6Jv0eW5zMnjYjIgFfN+ImfIRW5neYTSsMzChkBUIOeAwXioZsb9cOF2qB2+9pnQeUlFsGG\n O0Kixo+/qLxzeCa1afsVPSfWTBQ4HyTPC76/9Aw3AqJZxl+rtsT4g8db532Vo0=", "X-Proofpoint-GUID": "upfKDx0JS_FW-jH-0KLALZRbc-pujr_u", "X-Proofpoint-ORIG-GUID": "upfKDx0JS_FW-jH-0KLALZRbc-pujr_u", "X-Authority-Info-Out": "v=2.4 cv=GtFPO01C c=1 sm=1 tr=0 ts=69cfcdbe\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=Gr33WSPopR-aU8k7cJUA: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 malwarescore=0\n mlxscore=0 suspectscore=0 mlxlogscore=986\n bulkscore=0 clxscore=1030\n phishscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 classifier=spam\n authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2604030128", "Received-SPF": "pass client-ip=57.103.76.181;\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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Windows 10 doesn't have the API for this, so using this\nonly for Windows 11.\n\nSigned-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>\n---\n include/system/whpx-internal.h | 9 ++++\n target/i386/cpu.c | 25 ++++++++++++\n target/i386/whpx/whpx-all.c | 75 ++++++++++++++++++++++++++++++++--\n target/i386/whpx/whpx-i386.h | 4 ++\n 4 files changed, 109 insertions(+), 4 deletions(-)\n create mode 100644 target/i386/whpx/whpx-i386.h", "diff": "diff --git a/include/system/whpx-internal.h b/include/system/whpx-internal.h\nindex 8482901f71..5902124b63 100644\n--- a/include/system/whpx-internal.h\n+++ b/include/system/whpx-internal.h\n@@ -73,6 +73,14 @@ void whpx_apic_get(APICCommonState *s);\n X(HRESULT, WHvGetVirtualProcessorRegisters, (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME* RegisterNames, UINT32 RegisterCount, WHV_REGISTER_VALUE* RegisterValues)) \\\n X(HRESULT, WHvSetVirtualProcessorRegisters, (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, const WHV_REGISTER_NAME* RegisterNames, UINT32 RegisterCount, const WHV_REGISTER_VALUE* RegisterValues)) \\\n \n+#ifdef __x86_64__\n+#define LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL_ARCH(X) \\\n+ X(HRESULT, WHvGetVirtualProcessorCpuidOutput, \\\n+ (WHV_PARTITION_HANDLE Partition, UINT32 VpIndex, UINT32 Eax, \\\n+ UINT32 Ecx, WHV_CPUID_OUTPUT *CpuidOutput))\n+#else\n+#define LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL_ARCH(X)\n+#endif\n /*\n * These are supplemental functions that may not be present\n * on all versions and are not critical for basic functionality.\n@@ -89,6 +97,7 @@ void whpx_apic_get(APICCommonState *s);\n UINT32 StateSize)) \\\n X(HRESULT, WHvResetPartition, \\\n (WHV_PARTITION_HANDLE Partition)) \\\n+ LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL_ARCH(X)\n \n #define WHP_DEFINE_TYPE(return_type, function_name, signature) \\\n typedef return_type (WINAPI *function_name ## _t) signature;\ndiff --git a/target/i386/cpu.c b/target/i386/cpu.c\nindex c6fd1dc00e..0000093fa3 100644\n--- a/target/i386/cpu.c\n+++ b/target/i386/cpu.c\n@@ -26,6 +26,8 @@\n #include \"tcg/helper-tcg.h\"\n #include \"exec/translation-block.h\"\n #include \"system/hvf.h\"\n+#include \"system/whpx.h\"\n+#include \"whpx/whpx-i386.h\"\n #include \"hvf/hvf-i386.h\"\n #include \"kvm/kvm_i386.h\"\n #include \"kvm/tdx.h\"\n@@ -8087,6 +8089,17 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *cpu, FeatureWord w)\n r = hvf_get_supported_cpuid(wi->cpuid.eax,\n wi->cpuid.ecx,\n wi->cpuid.reg);\n+ } else if (whpx_enabled()) {\n+ if (wi->type != CPUID_FEATURE_WORD) {\n+ return 0;\n+ }\n+ if (whpx_is_legacy_os()) {\n+ r = wi->tcg_features;\n+ } else {\n+ r = whpx_get_supported_cpuid(wi->cpuid.eax,\n+ wi->cpuid.ecx,\n+ wi->cpuid.reg);\n+ }\n } else if (tcg_enabled() || qtest_enabled()) {\n r = wi->tcg_features;\n } else {\n@@ -8168,6 +8181,18 @@ static void x86_cpu_get_supported_cpuid(uint32_t func, uint32_t index,\n *ebx = hvf_get_supported_cpuid(func, index, R_EBX);\n *ecx = hvf_get_supported_cpuid(func, index, R_ECX);\n *edx = hvf_get_supported_cpuid(func, index, R_EDX);\n+ } else if (whpx_enabled()) {\n+ if (whpx_is_legacy_os()) {\n+ *eax = 0;\n+ *ebx = 0;\n+ *ecx = 0;\n+ *edx = 0;\n+ } else {\n+ *eax = whpx_get_supported_cpuid(func, index, R_EAX);\n+ *ebx = whpx_get_supported_cpuid(func, index, R_EBX);\n+ *ecx = whpx_get_supported_cpuid(func, index, R_ECX);\n+ *edx = whpx_get_supported_cpuid(func, index, R_EDX);\n+ }\n } else {\n *eax = 0;\n *ebx = 0;\ndiff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c\nindex 4127440c0c..2d527b90dd 100644\n--- a/target/i386/whpx/whpx-all.c\n+++ b/target/i386/whpx/whpx-all.c\n@@ -36,6 +36,7 @@\n #include \"system/whpx-accel-ops.h\"\n #include \"system/whpx-all.h\"\n #include \"system/whpx-common.h\"\n+#include \"whpx-i386.h\"\n \n #include \"emulate/x86_decode.h\"\n #include \"emulate/x86_emu.h\"\n@@ -49,6 +50,8 @@\n /* for kernel-irqchip=off */\n #define HV_X64_MSR_APIC_FREQUENCY 0x40000023\n \n+static bool is_modern_os = true;\n+\n static const WHV_REGISTER_NAME whpx_register_names[] = {\n \n /* X64 General purpose registers */\n@@ -1062,6 +1065,71 @@ static void whpx_init_emu(void)\n init_emu(&whpx_x86_emul_ops);\n }\n \n+bool whpx_is_legacy_os(void)\n+{\n+ return !is_modern_os;\n+}\n+\n+uint32_t whpx_get_supported_cpuid(uint32_t func, uint32_t idx, int reg)\n+{\n+ WHV_CPUID_OUTPUT output;\n+ uint32_t eax, ebx, ecx, edx;\n+ uint32_t cpu_index = 0;\n+ bool temp_cpu = true;\n+ HRESULT hr;\n+\n+ hr = whp_dispatch.WHvCreateVirtualProcessor(\n+ whpx_global.partition, cpu_index, 0);\n+\n+ /* This means that the CPU already exists... */\n+ if (FAILED(hr)) {\n+ temp_cpu = false;\n+ }\n+\n+ hr = whp_dispatch.WHvGetVirtualProcessorCpuidOutput(whpx_global.partition,\n+ cpu_index, func, idx, &output);\n+\n+ if (FAILED(hr)) {\n+ abort();\n+ }\n+\n+ if (temp_cpu) {\n+ hr = whp_dispatch.WHvDeleteVirtualProcessor(whpx_global.partition, cpu_index);\n+ if (FAILED(hr)) {\n+ abort();\n+ }\n+ }\n+\n+ eax = output.Eax;\n+ ebx = output.Ebx;\n+ ecx = output.Ecx;\n+ edx = output.Edx;\n+\n+ /*\n+ * We can emulate X2APIC even for the kernel-irqchip=off case.\n+ * CPUID_EXT_HYPERVISOR and CPUID_HT should be considered present\n+ * always, so report them as unconditionally supported here.\n+ */\n+ if (func == 1) {\n+ ecx |= CPUID_EXT_X2APIC;\n+ ecx |= CPUID_EXT_HYPERVISOR;\n+ edx |= CPUID_HT;\n+ }\n+\n+ switch (reg) {\n+ case R_EAX:\n+ return eax;\n+ case R_EBX:\n+ return ebx;\n+ case R_ECX:\n+ return ecx;\n+ case R_EDX:\n+ return edx;\n+ default:\n+ return 0;\n+ }\n+}\n+\n /*\n * Controls whether we should intercept various exceptions on the guest,\n * namely breakpoint/single-step events.\n@@ -2235,7 +2303,6 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n WHV_CAPABILITY_FEATURES features = {0};\n WHV_PROCESSOR_FEATURES_BANKS processor_features;\n WHV_PROCESSOR_PERFMON_FEATURES perfmon_features;\n- bool is_legacy_os = false;\n UINT32 cpuidExitList[] = {1};\n \n whpx = &whpx_global;\n@@ -2395,7 +2462,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n if (FAILED(hr)) {\n warn_report(\"WHPX: Failed to get performance \"\n \"monitoring features, hr=%08lx\", hr);\n- is_legacy_os = true;\n+ is_modern_os = false;\n } else {\n hr = whp_dispatch.WHvSetPartitionProperty(\n whpx->partition,\n@@ -2435,7 +2502,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n synthetic_features.Bank0.DirectSyntheticTimers = 1;\n }\n \n- if (!is_legacy_os && whpx->hyperv_enlightenments_allowed) {\n+ if (is_modern_os && whpx->hyperv_enlightenments_allowed) {\n hr = whp_dispatch.WHvSetPartitionProperty(\n whpx->partition,\n WHvPartitionPropertyCodeSyntheticProcessorFeaturesBanks,\n@@ -2446,7 +2513,7 @@ int whpx_accel_init(AccelState *as, MachineState *ms)\n ret = -EINVAL;\n goto error;\n }\n- } else if (is_legacy_os && whpx->hyperv_enlightenments_required) {\n+ } else if (!is_modern_os && whpx->hyperv_enlightenments_required) {\n error_report(\"Hyper-V enlightenments not available on legacy Windows\");\n ret = -EINVAL;\n goto error;\ndiff --git a/target/i386/whpx/whpx-i386.h b/target/i386/whpx/whpx-i386.h\nnew file mode 100644\nindex 0000000000..6db9a75d39\n--- /dev/null\n+++ b/target/i386/whpx/whpx-i386.h\n@@ -0,0 +1,4 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+\n+uint32_t whpx_get_supported_cpuid(uint32_t func, uint32_t idx, int reg);\n+bool whpx_is_legacy_os(void);\n", "prefixes": [ "v5", "3/9" ] }