{"id":2196195,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2196195/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20260213034556.13471-8-mohamed@unpredictable.fr>","date":"2026-02-13T03:45:50","name":"[v2,07/10] whpx: remove remaining winhvemulation support code","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5ed7f9d6cc47e5ffe941a571b0e4ce669e0834c4","submitter":{"id":91318,"url":"http://patchwork.ozlabs.org/api/1.0/people/91318/?format=json","name":"Mohamed Mediouni","email":"mohamed@unpredictable.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260213034556.13471-8-mohamed@unpredictable.fr/mbox/","series":[{"id":492055,"url":"http://patchwork.ozlabs.org/api/1.0/series/492055/?format=json","date":"2026-02-13T03:45:43","name":"whpx: x86 updates (2026-02)","version":2,"mbox":"http://patchwork.ozlabs.org/series/492055/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2196195/checks/","tags":{},"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=E78hpZtc;\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 4fBymv57tTz1xpY\n\tfor ; Fri, 13 Feb 2026 14:47:59 +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 1vqk8X-0008JJ-DP; Thu, 12 Feb 2026 22:46:33 -0500","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 1vqk8W-0008JA-Nh\n for qemu-devel@nongnu.org; Thu, 12 Feb 2026 22:46:32 -0500","from p-west1-cluster4-host9-snip4-8.eps.apple.com ([57.103.65.159]\n helo=outbound.pv.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 1vqk8V-0005cn-06\n for qemu-devel@nongnu.org; Thu, 12 Feb 2026 22:46:32 -0500","from outbound.pv.icloud.com (unknown [127.0.0.2])\n by p00-icloudmta-asmtp-us-west-1a-60-percent-11 (Postfix) with ESMTPS id\n F1A1718002D8; Fri, 13 Feb 2026 03:46:28 +0000 (UTC)","from localhost.localdomain (unknown [17.56.9.36])\n by p00-icloudmta-asmtp-us-west-1a-60-percent-11 (Postfix) with ESMTPSA id\n 9DF3518002E4; Fri, 13 Feb 2026 03:46:25 +0000 (UTC)"],"Dkim-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr;\n s=sig1; t=1770954389; x=1773546389;\n bh=GMKDLR1ZRQkqFLoZNb51fIAURVKjNkL9YCABneXfO8s=;\n h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme;\n b=E78hpZtczR9HOsmA/th4k1SVxOlPNpXl9zWh1N56arOMmt03iirWipJaqvXVwtpqHltsXnQ4TXeersshaQAjhVf7TODJ62yBVSGs7P93BaprUGOAmUspNamfWkD58UsZ4ylttO8otYq9dALY3uo0JRFTMo5IUgONy2xLKwbIfLlSHbUXJUJCGAqUMhwqdN8OMTMMZ5OOh533+4enB0TROzSIXCLSL2xP6VAzhizT5y+TMM6iiKpww8y+JG2TXF3OdJsFqyBUZ8XkdAbN9KNsxSyM9Na1/0QKTYLBtnBM0svylfrOINM/3PMmmjFRcXvmFLMntbUMtcNgpR9Bi6RbOw==","mail-alias-created-date":"1752046281608","From":"Mohamed Mediouni ","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n Magnus Kulke , =?utf-8?q?Philippe_Mathieu-?=\n\t=?utf-8?q?Daud=C3=A9?= ,\n Bernhard Beschow , Paolo Bonzini ,\n Mohamed Mediouni , Wei Liu ,\n Pedro Barbuda , Cameron Esfahani ,\n Peter Maydell ,\n Phil Dennis-Jordan , Zhao Liu ,\n Roman Bolshakov ,\n =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= ","Subject":"[PATCH v2 07/10] whpx: remove remaining winhvemulation support code","Date":"Fri, 13 Feb 2026 04:45:50 +0100","Message-ID":"<20260213034556.13471-8-mohamed@unpredictable.fr>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260213034556.13471-1-mohamed@unpredictable.fr>","References":"<20260213034556.13471-1-mohamed@unpredictable.fr>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-GUID":"0vQIbi4TjvnbayvRVXZXamZJIroDiaIO","X-Authority-Info-Out":"v=2.4 cv=C5HkCAP+ c=1 sm=1 tr=0 ts=698e9e95\n cx=c_apl:c_apl_out:c_pps a=azHRBMxVc17uSn+fyuI/eg==:117\n a=azHRBMxVc17uSn+fyuI/eg==:17 a=HzLeVaNsDn8A:10 a=VkNPw1HP01LnGYTKEx00:22\n a=Mpw57Om8IfrbqaoTuvik:22 a=GgsMoib0sEa3-_RKJdDe:22 a=UBzWkQmmy9v7-gCQCgEA:9","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwMjEzMDAyNSBTYWx0ZWRfX0cUYDt//7ha1\n Ya9tqQpDjbujV91sLgup4LagCuHyHPRcHTXXx/f2m0QO2gvhm0/rF58dv1hs4NQpzQ2em2qHqqr\n EztXev0c9oOH89hy7wUNwchwKkDxH1G8v71swDAmLWCTf1v4wFfP6gr8zLBbHNdNKyBWUk3LZ5V\n /NCxmMN3ZC0lTaGSt33P2OkUB8/CzyE0FyLYzgxSVncEs+XzeXQ5ww2j6MO1AhFajR85m+VZk3C\n 4jT9Y0KKs4vSE3JaDlmWUw3bLzli0dAXHLabsHa9mbgy6Yk6CA3Ggir3gqgkpKIisiDa0aVFwrZ\n PX7tDAIObOQxR8hRPKRH8QKAD6378Be2zo5nQ25l93teuHchwsl/X1luIOF3P8=","X-Proofpoint-ORIG-GUID":"0vQIbi4TjvnbayvRVXZXamZJIroDiaIO","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-02-12_05,2026-02-12_03,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 bulkscore=0\n adultscore=0 phishscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0\n clxscore=1030 mlxlogscore=999 mlxscore=0 malwarescore=0 classifier=spam\n authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000\n definitions=main-2602130025","X-JNJ":"\n AAAAAAABMBoQz/FN1pyCXXvEdgmYa3bDf/DjMByqeHIwmaQR2sWLHXIc/lqVwI9w87+0wdbY0HOSRE0wgwUcCsOkVvfIuvsGCZSqBA3e3xaUIbLsSyzi/Pds+CqdHy3+JL6J2m6ykf64XIaoccu+wEIGGfuyv0sP4JjGnaWo/7hM5CSmk/DQDGdOZVmFDZTc1a6POcRNnMEmEtSuAq4ybWuYd0aNus9Wz1ccn68XLGnGn9IC8RXJc1LveLVyxMRcx8F07lM7vNOhGrJV4S4My8lXqtydvzZvtz1+PR1i91NKNDSsYz4qBlIQ3F9+tUGKQaMXSwsJpU3Kf97sR5VE6MhokfTpsG159U/xrOBM5hhVvc0YEE8JIYn82LxNMWulaKdvc9si0O3ULq3xNqZ/gohwO2YmQDmPAGWFG/DdHdXQ7kB81cClpBigv/EGy4k5KhuhsQJ5yoxSGj80OIzKw+BD7tWRYFjPjZTbUJU3RtoezcR52JXvZP2G7KjH3kpwynwxmUwJl0bkGUJtJRzHtMu9D2ZdChbu/PdtZxF5FO3LFoMjhiNU80ps1QWXAzpZfpIN5M+zY0IjJoapnidD9BjfRKaAHJEouaa6SslE+SjC7ZWCnxiDZZKYra151p58Ye56hGwhKi8Ui1YM0AbOxsnyWIHSGbqZ5Qk+JOdlxF9TZC3hz+PuolskSGSi1nOlIRCCbUWSycyaM5TRnXiBcINIuTCnLWykps0H+fbVMB/nEvb3i4QGjOUWBKhDokcE/vxQskiQqw/KFMqp/7hFmw4j7EppWEAOTWy5Aw==","Received-SPF":"pass client-ip=57.103.65.159;\n envelope-from=mohamed@unpredictable.fr; helo=outbound.pv.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 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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":"After moving away to target/i386/emulate, this is no longer necessary.\n\nSigned-off-by: Mohamed Mediouni \n---\n accel/whpx/whpx-common.c | 22 ----------------------\n include/system/whpx-common.h | 3 ---\n include/system/whpx-internal.h | 16 ----------------\n meson.build | 3 +--\n 4 files changed, 1 insertion(+), 43 deletions(-)","diff":"diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c\nindex c2263c2496..245e64a12f 100644\n--- a/accel/whpx/whpx-common.c\n+++ b/accel/whpx/whpx-common.c\n@@ -39,9 +39,6 @@ bool whpx_allowed;\n bool whpx_irqchip_in_kernel;\n static bool whp_dispatch_initialized;\n static HMODULE hWinHvPlatform;\n-#ifdef HOST_X86_64\n-static HMODULE hWinHvEmulation;\n-#endif\n \n struct whpx_state whpx_global;\n struct WHPDispatch whp_dispatch;\n@@ -393,7 +390,6 @@ static bool load_whp_dispatch_fns(HMODULE *handle,\n HMODULE hLib = *handle;\n \n #define WINHV_PLATFORM_DLL \"WinHvPlatform.dll\"\n- #define WINHV_EMULATION_DLL \"WinHvEmulation.dll\"\n #define WHP_LOAD_FIELD_OPTIONAL(return_type, function_name, signature) \\\n whp_dispatch.function_name = \\\n (function_name ## _t)GetProcAddress(hLib, #function_name); \\\n@@ -420,14 +416,6 @@ static bool load_whp_dispatch_fns(HMODULE *handle,\n WHP_LOAD_LIB(WINHV_PLATFORM_DLL, hLib)\n LIST_WINHVPLATFORM_FUNCTIONS(WHP_LOAD_FIELD)\n break;\n- case WINHV_EMULATION_FNS_DEFAULT:\n-#ifdef HOST_X86_64\n- WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib)\n- LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD)\n-#else\n- g_assert_not_reached();\n-#endif\n- break;\n case WINHV_PLATFORM_FNS_SUPPLEMENTAL:\n WHP_LOAD_LIB(WINHV_PLATFORM_DLL, hLib)\n LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_LOAD_FIELD_OPTIONAL)\n@@ -543,11 +531,6 @@ bool init_whp_dispatch(void)\n if (!load_whp_dispatch_fns(&hWinHvPlatform, WINHV_PLATFORM_FNS_DEFAULT)) {\n goto error;\n }\n-#ifdef HOST_X86_64\n- if (!load_whp_dispatch_fns(&hWinHvEmulation, WINHV_EMULATION_FNS_DEFAULT)) {\n- goto error;\n- }\n-#endif\n assert(load_whp_dispatch_fns(&hWinHvPlatform,\n WINHV_PLATFORM_FNS_SUPPLEMENTAL));\n whp_dispatch_initialized = true;\n@@ -557,11 +540,6 @@ error:\n if (hWinHvPlatform) {\n FreeLibrary(hWinHvPlatform);\n }\n-#ifdef HOST_X86_64\n- if (hWinHvEmulation) {\n- FreeLibrary(hWinHvEmulation);\n- }\n-#endif\n return false;\n }\n \ndiff --git a/include/system/whpx-common.h b/include/system/whpx-common.h\nindex 5bce33e336..fa2cc9a2ce 100644\n--- a/include/system/whpx-common.h\n+++ b/include/system/whpx-common.h\n@@ -3,9 +3,6 @@\n #define SYSTEM_WHPX_COMMON_H\n \n struct AccelCPUState {\n-#ifdef HOST_X86_64\n- WHV_EMULATOR_HANDLE emulator;\n-#endif\n bool window_registered;\n bool interruptable;\n bool ready_for_pic_interrupt;\ndiff --git a/include/system/whpx-internal.h b/include/system/whpx-internal.h\nindex ad6ade223e..7a1c9871f1 100644\n--- a/include/system/whpx-internal.h\n+++ b/include/system/whpx-internal.h\n@@ -4,9 +4,6 @@\n \n #include \n #include \n-#ifdef HOST_X86_64\n-#include \n-#endif\n #include \"hw/i386/apic.h\"\n #include \"exec/vaddr.h\"\n \n@@ -89,12 +86,6 @@ void whpx_apic_get(APICCommonState *s);\n X(HRESULT, WHvResetPartition, \\\n (WHV_PARTITION_HANDLE Partition)) \\\n \n-#define LIST_WINHVEMULATION_FUNCTIONS(X) \\\n- X(HRESULT, WHvEmulatorCreateEmulator, (const WHV_EMULATOR_CALLBACKS* Callbacks, WHV_EMULATOR_HANDLE* Emulator)) \\\n- X(HRESULT, WHvEmulatorDestroyEmulator, (WHV_EMULATOR_HANDLE Emulator)) \\\n- X(HRESULT, WHvEmulatorTryIoEmulation, (WHV_EMULATOR_HANDLE Emulator, VOID* Context, const WHV_VP_EXIT_CONTEXT* VpContext, const WHV_X64_IO_PORT_ACCESS_CONTEXT* IoInstructionContext, WHV_EMULATOR_STATUS* EmulatorReturnStatus)) \\\n- X(HRESULT, WHvEmulatorTryMmioEmulation, (WHV_EMULATOR_HANDLE Emulator, VOID* Context, const WHV_VP_EXIT_CONTEXT* VpContext, const WHV_MEMORY_ACCESS_CONTEXT* MmioInstructionContext, WHV_EMULATOR_STATUS* EmulatorReturnStatus)) \\\n-\n #define WHP_DEFINE_TYPE(return_type, function_name, signature) \\\n typedef return_type (WINAPI *function_name ## _t) signature;\n \n@@ -103,16 +94,10 @@ void whpx_apic_get(APICCommonState *s);\n \n /* Define function typedef */\n LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE)\n-#ifdef HOST_X86_64\n-LIST_WINHVEMULATION_FUNCTIONS(WHP_DEFINE_TYPE)\n-#endif\n LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DEFINE_TYPE)\n \n struct WHPDispatch {\n LIST_WINHVPLATFORM_FUNCTIONS(WHP_DECLARE_MEMBER)\n-#ifdef HOST_X86_64\n- LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER)\n-#endif\n LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER)\n };\n \n@@ -122,7 +107,6 @@ bool init_whp_dispatch(void);\n \n typedef enum WHPFunctionList {\n WINHV_PLATFORM_FNS_DEFAULT,\n- WINHV_EMULATION_FNS_DEFAULT,\n WINHV_PLATFORM_FNS_SUPPLEMENTAL\n } WHPFunctionList;\n \ndiff --git a/meson.build b/meson.build\nindex e8fd77aac0..8f5e55810f 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -865,8 +865,7 @@ if get_option('whpx').allowed() and host_os == 'windows'\n endif\n # Leave CONFIG_WHPX disabled\n else\n- if cc.has_header('winhvplatform.h', required: get_option('whpx')) and \\\n- cc.has_header('winhvemulation.h', required: get_option('whpx'))\n+ if cc.has_header('winhvplatform.h', required: get_option('whpx'))\n accelerators += 'CONFIG_WHPX'\n endif\n endif\n","prefixes":["v2","07/10"]}