From nobody Mon Feb 9 23:58:06 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=1769539034; cv=none; d=zohomail.com; s=zohoarc; b=HuhYZzUEl5xHcRGjuOa6gLWMf+rWYI1zuBrRIbq0Ac01lLYtMb2eG6tCdivYacvtEfE1JKq0nuJdq6MWC157imj3wt9Vs5Cd/H2IoeR3O0mNAMZHWInh+ZhpUVB9vD8c5ComPMth7MrQs490dHzz1oC5Vi+oYqj9Iec65gAp3tM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769539034; h=Content-Type: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=mBFnX+1GWKubPDZlgEM1plJqBHQoJzuLiKUgkg0UYPU=; b=JftWEvuxIddtwosbeRjoOzNKYpdEW7uJbMYUbawsIeOZFMaQJ/9yn0CfBgPCMwljjGwiOCXyIzj65oA2C02z48CXsB/eZ138VaYsUFmGCftNbwpZeVBy8+gOuIbq3HM4yo/Z6u5g+r3qr3MtFUXT6PFRAIKc1yliaQpKUFVBHb4= 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 1769539034938135.723517431069; Tue, 27 Jan 2026 10:37:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vknrA-0008HH-9f; Tue, 27 Jan 2026 13:32:04 -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 1vknoQ-00022r-16 for qemu-devel@nongnu.org; Tue, 27 Jan 2026 13:29:25 -0500 Received: from p-west2-cluster1-host3-snip4-1.eps.apple.com ([57.103.68.64] helo=outbound.mr.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vknoL-0003Y2-Pe for qemu-devel@nongnu.org; Tue, 27 Jan 2026 13:29:12 -0500 Received: from outbound.mr.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-2a-100-percent-11 (Postfix) with ESMTPS id 4BEC818001C8; Tue, 27 Jan 2026 18:29:00 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.152.38]) by p00-icloudmta-asmtp-us-west-2a-100-percent-11 (Postfix) with ESMTPSA id 4343E1800243; Tue, 27 Jan 2026 18:28:54 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1769538543; x=1772130543; bh=mBFnX+1GWKubPDZlgEM1plJqBHQoJzuLiKUgkg0UYPU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=g1eqUnOYdpXzQu9XU5irBv/JCJm+QDeVJbsLPIusCbLWhM6QNwe8wdxYpk1O+QJweFmb2NU538zbDg/PwvxL1OpF8g7IStcpcOPMClYKmxieNxj1YwaG+v5ZKyXYIFs9fOMn0bo1ehN7XuhH5N8fMI2v8jujPpNQrrhYKYQYJRvk/32Ect4UxudeWo0hDTUzUjwwcJwhaMcfvmVY3urtirv+O9KtDASOhMGo3yT+JEw0LzqxYYhk5rYJKFrBRBYtkV0ZRVrwROGphx8BlwsWI/937M4censChfKzuYKFKzNyns4zL1ziytrR7f9pxfigGkmy0lgQpz9WXK7SdR1Agg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Zhao Liu , "Michael S. Tsirkin" , Roman Bolshakov , qemu-arm@nongnu.org, Ani Sinha , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Akihiko Odaki , Marcel Apfelbaum , Pedro Barbuda , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Shannon Zhao , Igor Mammedov , Cameron Esfahani , Alexander Graf , Peter Maydell , Eduardo Habkost , Phil Dennis-Jordan , Pierrick Bouvier Subject: [PATCH v18 10/22] whpx: ifdef out winhvemulation on non-x86_64 Date: Tue, 27 Jan 2026 19:27:50 +0100 Message-ID: <20260127182805.73212-11-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260127182805.73212-1-mohamed@unpredictable.fr> References: <20260127182805.73212-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Info-Out: v=2.4 cv=Uu5u9uwB c=1 sm=1 tr=0 ts=697903ee cx=c_apl:c_apl_out:c_pps a=9OgfyREA4BUYbbCgc0Y0oA==:117 a=9OgfyREA4BUYbbCgc0Y0oA==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=VExx-Oqz_yhFp4n2Ql0A:9 a=0bXxn9q0MV6snEgNplNhOjQmxlI=:19 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: c_IOwPH681dqh3heLjUWcmMQsAl76s4B X-Proofpoint-ORIG-GUID: c_IOwPH681dqh3heLjUWcmMQsAl76s4B X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI3MDE1MCBTYWx0ZWRfXyrJ0SJiMHvFm KGbKzze4zjVzsxYSlhEuyrCOR0goETzzeZ74757lCcZX3vRsOcQI55kcgJmLmq95z0yaKdsiS+q SrAX7V2bWjRuIM5xHKQ0Sv+iXDQrcW4I1O9PFI82EaKBkObfZ6dAsv2UDwQDC8xsg8yiEXcSaFS wXn0MPu45c167JH8AGRT0darl4SnmdohTQ0tQEsW0B2o42IDHsie7JgnINPxvZU08L7pbHjIfP4 zTlMTeewNHKYtGvV+/rQTx2/kfGkfXS4vz5XvwfkK7WWHWD49D9OAGYogAPLWkg7/jRaqxHP7+k ztDrwaqvOjpD+WVZjYwmbo+iHclrViekTbM4PUf6TskYDY9447qHmh9Vx/tkCo= 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-01-27_04,2026-01-27_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 clxscore=1030 bulkscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 mlxlogscore=983 adultscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601270150 X-JNJ: AAAAAAABtvzkqx6fXaizTSF+70wv5zSExgcgsPxSVD6ANBkOpY9K3HvfEYzZalb/sV9UWhdEimeiPFwLPUc0sTd0gtgcBezW6H6cwZ2HQsdnLOYMUOlJt1NviUWQFH84/8agMmoznDhdxgTuDcPFTBq3oC5Oc+mELylFtY8Ha1CZwSNlJ+apm05dA7tshRGKi7dh96x9CTKLs9E11/8nM/Y3OrRUStKk5908TaOZN5NnRnbROdn8oB+rnhzshi9rKDYEABQImXUWOOxi1HKscyv/SxTdhksSUE6NDU/nCKRmw60RLl6AvB2hn4Dh1dE3X+nn3QxVyDCVlyIP2EbdCvp/uHBEJwdPIF1/UYodZMrHwMHjIlRC2XRkBGHmiGWV5AZYBvnRVcLJ4us+EKXjGOi83hmowecvZhUUumdqEHgEYNOM+o4UWs39bhG39rqvS1oUUcXD8/U0pqWHxvTmXaLDjNn9CQPajxm5V7giuADADvfVGFa8TCX+JKQiFSUvAKoAsRE3tEAo3kOnI4fMoTWN+X7FoUgp0FTUK15tmn9x3OKpgpGPGD6dpLWBFzkV/7fYzomaDQFoIhbrGsrZN6rzTB/ZPg1L0/5YpJnnYGLUBSGfypmiRvkC0TVQ/NJQ+zXCxZHcJZOKf0k66qEMjDo3VA/t/c/lkGWf2PzhjsJdK9xxtntYZ3XPyU+tRZv9+/p0Cr2c7c7vFedBH8OAb9WeFxkSDBY4xXv6Xo1q1lTzWe763lUXyaoLclbBSRunPwv+AJ+Dd2sTA8MwWpfZDlH+NqyI1QXsKhsjiszDOpVR/4VOuHS6OccFvPqFiftQhThC5zk+JVeIl8dW9UHx16e50oZTMJMfZA+SNCl2iAA3PwZEr2tbJvsexVjYHCgB5WgmIM2M5mLU+eOJ7//Pm7ZTbpljOqL2+N6kJylFtiXEB+gJsYAdcUU= 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.68.64; envelope-from=mohamed@unpredictable.fr; helo=outbound.mr.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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: , 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: 1769539036685154100 winhvemulation is x86_64 only. In the future, we might want to get rid of winhvemulation usage entirely. Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/whpx/whpx-common.c | 14 ++++++++++++-- include/system/whpx-common.h | 2 ++ include/system/whpx-internal.h | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index 0a6068fdde..c58344cb61 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -37,7 +37,9 @@ bool whpx_allowed; 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; @@ -232,8 +234,10 @@ void whpx_destroy_vcpu(CPUState *cpu) struct whpx_state *whpx =3D &whpx_global; =20 whp_dispatch.WHvDeleteVirtualProcessor(whpx->partition, cpu->cpu_index= ); +#ifdef HOST_X86_64 AccelCPUState *vcpu =3D cpu->accel; whp_dispatch.WHvEmulatorDestroyEmulator(vcpu->emulator); +#endif g_free(cpu->accel); } =20 @@ -408,8 +412,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle, 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) @@ -535,11 +543,11 @@ 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; @@ -549,9 +557,11 @@ 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 e549c7539c..8f171d1397 100644 --- a/include/system/whpx-common.h +++ b/include/system/whpx-common.h @@ -3,7 +3,9 @@ #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 041fa958b4..609d0e1c08 100644 --- a/include/system/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -4,8 +4,9 @@ =20 #include #include +#ifdef HOST_X86_64 #include - +#endif #include "hw/i386/apic.h" #include "exec/vaddr.h" =20 @@ -101,12 +102,16 @@ 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 --=20 2.50.1 (Apple Git-155)