From nobody Sun Apr 12 06:08:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1770789331; cv=none; d=zohomail.com; s=zohoarc; b=h3rEFaXu6YVSHALUtdiEgSKaEZdUSRW73esjKGxFCsqI44rLrgTDrogTrqIQRLYXFUJswl6ZxL2Xu3LhZdgmPxGNUMyZaNsRmhp0dpAy7zEiyJqH/bahgg1Ryl3iXX52qmnkSOWj1PE6smHld7w0yvYPe5sxIKVrSQ2MqDFp/tY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770789331; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9K8msZEsB74w5xUYMfu4xSNX/KrRn+3Zoq0itnJzfNI=; b=DpeGxpd5SZ4ANve9aEOd3aDqIvIzdVcH2Lcy1mGNQbM6xhvLaR+MoypfTxkQ/qbDqPmBPzQTx0u7e1sq5Jr4dM+Wr7dS1iE+qjHhXTQW243smKSxF+S62latq4TLTBIQfSmH2ozNEgeSofzvXWxRHyX1IE4w2Gi3l3sY+kgT0Fc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177078933073128.48572728908232; Tue, 10 Feb 2026 21:55:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vq3BB-0005ZW-VF; Wed, 11 Feb 2026 00:54:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vq3BA-0005YW-KA for qemu-devel@nongnu.org; Wed, 11 Feb 2026 00:54:24 -0500 Received: from p-west3-cluster1-host5-snip4-6.eps.apple.com ([57.103.73.177] helo=outbound.ms.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vq3B8-0002sO-V2 for qemu-devel@nongnu.org; Wed, 11 Feb 2026 00:54:24 -0500 Received: from outbound.ms.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-3a-100-percent-7 (Postfix) with ESMTPS id 4B83B180018F; Wed, 11 Feb 2026 05:54:20 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.154.37]) by p00-icloudmta-asmtp-us-west-3a-100-percent-7 (Postfix) with ESMTPSA id 3D3901800188; Wed, 11 Feb 2026 05:54:17 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1770789261; x=1773381261; bh=9K8msZEsB74w5xUYMfu4xSNX/KrRn+3Zoq0itnJzfNI=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=AxebIELahx/MMkZGSuz0TD2rZVdkBkc+5Q/ZpGVARw4K3AnyoxVx9qHc4t9Q+6CLV2UNR4tft2ieTAKQWwtTsmSfPBsGOAyKoJtW63uGl93bJumaWStglqW8ATCh0xidcuFnI7QBZRvmoGiONKYoEFBPHBv1tiqZ2hxjyOq8vcXbXGA78doS1FbZeUKgAc/Fj2YuT8EmZuRDflp9Zi3Go+P7lmRMoXmRxk7LFYW22g38V7uwvBLMmOrWM/fyMu9SYhey+Y1RoWbEHgqkH9yNqcRofYipgwPGoNBHXvZ757yPOCIRp6Mnd/Un+63Cg0Fo4gXi3AXGHPLQom4wExI6Kg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Phil Dennis-Jordan , Wei Liu , Roman Bolshakov , Pedro Barbuda , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Cameron Esfahani , Zhao Liu , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Magnus Kulke , Mohamed Mediouni , Paolo Bonzini Subject: [PATCH 6/7] whpx: remove remaining winhvemulation support code Date: Wed, 11 Feb 2026 06:53:51 +0100 Message-ID: <20260211055356.44664-7-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260211055356.44664-1-mohamed@unpredictable.fr> References: <20260211055356.44664-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=JvH8bc4C c=1 sm=1 tr=0 ts=698c198d cx=c_apl:c_apl_out:c_pps a=qkKslKyYc0ctBTeLUVfTFg==:117 a=HzLeVaNsDn8A:10 a=VkNPw1HP01LnGYTKEx00:22 a=Mpw57Om8IfrbqaoTuvik:22 a=GgsMoib0sEa3-_RKJdDe:22 a=UBzWkQmmy9v7-gCQCgEA:9 X-Proofpoint-GUID: AK2XfCVVFUg3ilFx051XlaWtgdqv68FJ X-Proofpoint-ORIG-GUID: AK2XfCVVFUg3ilFx051XlaWtgdqv68FJ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjExMDA0NiBTYWx0ZWRfX/n+Os9HYeVAU qFLtuaoNf3a8/sUN63M6TtuycKEJ3FX/gC0tAxw1EvnZkqvkVpD3yYWUeaxkXb7cWFRzsh160SY vYDeWD6DUUM0RiNZMrz0QLO6jOLow7rNoLSuILB5rD5obgmhZiXJ/leK52QqYrOZ7qGpxQEGRJn iICVpVDscECxD3IFE4O/YYVC1NQZgd8CGth4+aFke1H3pfR1L/lnwvHmLl4Zb5KAuR3OYlZxDpR oF10hER10lvaY0ckWBi16A7NhKxB/VmYeGChe8jZuBWNW+u1cgnvmRg+3rq/jbzj5EI2UbCOgsr QWcxBZh1QZIu4xVZieK6R38VBHuLieyYQOnMk/nf0QaJLHVH9mWFm7XWVvpT98= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-02-10_03,2026-02-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 clxscore=1030 phishscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 lowpriorityscore=0 adultscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2602110046 X-JNJ: AAAAAAABQEOqu9gaNY0a/SXBYrXUXFg+NeC4nr771PNGZjAoLTihOUFY/RQPaYwXYZneELujfHL0J1hWqkRUeWWYQkTLPJ+5fTRsbJ0J4U4thnIK/57P9uuiH/qx5A56xw1GQ7C6CYihsJQzIVpmePpQLgnKtIE6pLucSOyCC3P3u+5HUVGVo5l5iC8wCu/2AVilkbmOBrd5FjrdF2Te/0gyM+fmkmJdZDRVAi3rEJ6Qg1j70PSu+/zpVNKXXd1idk2jw7et4+4E8QRHOkJDHeEswLX+FBBFcdaxoCt6LXSJKkI09qA7d66rpoWJ5GTRdCdc2FY1yyLH9iYtgufissDFh5wu/4HC+dhuO08uke1jpmGLMUK6Z7WdasfUV0noaEP7tvbtb8N589PjNncMf0PeISEPrKGRkniQqSiihKDLRf7ji90twwMjl2ju5wbdWEDq2aJ3040NzXiR9VGsSbq4aFeStHWxg1f0ANgga13djfUR+dv1pu1y6U7Fpg8WPOwIc/a6xDCBYjtAJObUWNXDgI2cSa/ZQxJA6FX03As/eWijPVsL3/Sargc5W0k5/Zj2tpgZocrSI8Zz3yo6/tASRuuzg42ZeHarLSMtOAlnemzQMuBY5RrD1pyIQwPiyAs5DdIOsGMo2WRJwmy6Cd+MG4OKwf/K5QaliDyyAbPEBr89QsYbr1o6d/KPEVxxwTQ+96nSpdsYhPNpUc2Sqqm6/hNbmV0kJqvkc0vNvhmv/eyfhMgAsOeplwUrZW9kXdhLAULDOAP8ZpnCOwQX/TuSbYoRb4QS Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=57.103.73.177; envelope-from=mohamed@unpredictable.fr; helo=outbound.ms.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1770789334999158500 Content-Type: text/plain; charset="utf-8" After moving away to target/i386/emulate, this is no longer necessary. Signed-off-by: Mohamed Mediouni --- accel/whpx/whpx-common.c | 22 ---------------------- include/system/whpx-common.h | 3 --- include/system/whpx-internal.h | 16 ---------------- meson.build | 3 +-- 4 files changed, 1 insertion(+), 43 deletions(-) diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index c2263c2496..245e64a12f 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -39,9 +39,6 @@ bool whpx_allowed; bool whpx_irqchip_in_kernel; static bool whp_dispatch_initialized; static HMODULE hWinHvPlatform; -#ifdef HOST_X86_64 -static HMODULE hWinHvEmulation; -#endif =20 struct whpx_state whpx_global; struct WHPDispatch whp_dispatch; @@ -393,7 +390,6 @@ static bool load_whp_dispatch_fns(HMODULE *handle, HMODULE hLib =3D *handle; =20 #define WINHV_PLATFORM_DLL "WinHvPlatform.dll" - #define WINHV_EMULATION_DLL "WinHvEmulation.dll" #define WHP_LOAD_FIELD_OPTIONAL(return_type, function_name, signature)= \ whp_dispatch.function_name =3D \ (function_name ## _t)GetProcAddress(hLib, #function_name); \ @@ -420,14 +416,6 @@ static bool load_whp_dispatch_fns(HMODULE *handle, WHP_LOAD_LIB(WINHV_PLATFORM_DLL, hLib) LIST_WINHVPLATFORM_FUNCTIONS(WHP_LOAD_FIELD) break; - case WINHV_EMULATION_FNS_DEFAULT: -#ifdef HOST_X86_64 - WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib) - LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD) -#else - g_assert_not_reached(); -#endif - break; case WINHV_PLATFORM_FNS_SUPPLEMENTAL: WHP_LOAD_LIB(WINHV_PLATFORM_DLL, hLib) LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_LOAD_FIELD_OPTIONAL) @@ -543,11 +531,6 @@ bool init_whp_dispatch(void) if (!load_whp_dispatch_fns(&hWinHvPlatform, WINHV_PLATFORM_FNS_DEFAULT= )) { goto error; } -#ifdef HOST_X86_64 - if (!load_whp_dispatch_fns(&hWinHvEmulation, WINHV_EMULATION_FNS_DEFAU= LT)) { - goto error; - } -#endif assert(load_whp_dispatch_fns(&hWinHvPlatform, WINHV_PLATFORM_FNS_SUPPLEMENTAL)); whp_dispatch_initialized =3D true; @@ -557,11 +540,6 @@ error: if (hWinHvPlatform) { FreeLibrary(hWinHvPlatform); } -#ifdef HOST_X86_64 - if (hWinHvEmulation) { - FreeLibrary(hWinHvEmulation); - } -#endif return false; } =20 diff --git a/include/system/whpx-common.h b/include/system/whpx-common.h index 5bce33e336..fa2cc9a2ce 100644 --- a/include/system/whpx-common.h +++ b/include/system/whpx-common.h @@ -3,9 +3,6 @@ #define SYSTEM_WHPX_COMMON_H =20 struct AccelCPUState { -#ifdef HOST_X86_64 - WHV_EMULATOR_HANDLE emulator; -#endif bool window_registered; bool interruptable; bool ready_for_pic_interrupt; diff --git a/include/system/whpx-internal.h b/include/system/whpx-internal.h index ad6ade223e..7a1c9871f1 100644 --- a/include/system/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -4,9 +4,6 @@ =20 #include #include -#ifdef HOST_X86_64 -#include -#endif #include "hw/i386/apic.h" #include "exec/vaddr.h" =20 @@ -89,12 +86,6 @@ void whpx_apic_get(APICCommonState *s); X(HRESULT, WHvResetPartition, \ (WHV_PARTITION_HANDLE Partition)) \ =20 -#define LIST_WINHVEMULATION_FUNCTIONS(X) \ - X(HRESULT, WHvEmulatorCreateEmulator, (const WHV_EMULATOR_CALLBACKS* Cal= lbacks, WHV_EMULATOR_HANDLE* Emulator)) \ - X(HRESULT, WHvEmulatorDestroyEmulator, (WHV_EMULATOR_HANDLE Emulator)) \ - X(HRESULT, WHvEmulatorTryIoEmulation, (WHV_EMULATOR_HANDLE Emulator, VOI= D* Context, const WHV_VP_EXIT_CONTEXT* VpContext, const WHV_X64_IO_PORT_ACC= ESS_CONTEXT* IoInstructionContext, WHV_EMULATOR_STATUS* EmulatorReturnStatu= s)) \ - X(HRESULT, WHvEmulatorTryMmioEmulation, (WHV_EMULATOR_HANDLE Emulator, V= OID* Context, const WHV_VP_EXIT_CONTEXT* VpContext, const WHV_MEMORY_ACCESS= _CONTEXT* MmioInstructionContext, WHV_EMULATOR_STATUS* EmulatorReturnStatus= )) \ - #define WHP_DEFINE_TYPE(return_type, function_name, signature) \ typedef return_type (WINAPI *function_name ## _t) signature; =20 @@ -103,16 +94,10 @@ void whpx_apic_get(APICCommonState *s); =20 /* Define function typedef */ LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE) -#ifdef HOST_X86_64 -LIST_WINHVEMULATION_FUNCTIONS(WHP_DEFINE_TYPE) -#endif LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DEFINE_TYPE) =20 struct WHPDispatch { LIST_WINHVPLATFORM_FUNCTIONS(WHP_DECLARE_MEMBER) -#ifdef HOST_X86_64 - LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER) -#endif LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER) }; =20 @@ -122,7 +107,6 @@ bool init_whp_dispatch(void); =20 typedef enum WHPFunctionList { WINHV_PLATFORM_FNS_DEFAULT, - WINHV_EMULATION_FNS_DEFAULT, WINHV_PLATFORM_FNS_SUPPLEMENTAL } WHPFunctionList; =20 diff --git a/meson.build b/meson.build index eeafd1d42b..970372bee2 100644 --- a/meson.build +++ b/meson.build @@ -865,8 +865,7 @@ if get_option('whpx').allowed() and host_os =3D=3D 'win= dows' endif # Leave CONFIG_WHPX disabled else - if cc.has_header('winhvplatform.h', required: get_option('whpx')) and \ - cc.has_header('winhvemulation.h', required: get_option('whpx')) + if cc.has_header('winhvplatform.h', required: get_option('whpx')) accelerators +=3D 'CONFIG_WHPX' endif endif --=20 2.50.1 (Apple Git-155)