From nobody Sat Feb 7 07:12:02 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=1770305326; cv=none; d=zohomail.com; s=zohoarc; b=VMbglsV/O+4MfqeYDk6dNY4p00mF10OvHNUpTsp0ayXH0eKYz5rpQBjyB7LTMhI/i6z/Q6a+pbkrO3+k2icORQbOaK7r3uNaUuyx5a3pd1b+xxQWDbgBIe/MQA8ebpT2E+uWKEjjNgqPVX1ZOkseJv4CpJS3H2JSNpvAe9HcfBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770305326; 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=MI3azbtVQYftmplvatAeyF9pVW/Q5l5dZRyfeaScoNwaYNcR+Fovvm5d/kZ+5LB7/wVVSBKQ2vmaPQTBsc3rxWUndinMXpplmV6HwvCUpJzMg7sthXd7xF4W7niCsFtAYp8QQ9zfP9i9m5UkOViceE/afftNfDFHztqLVSuGOC0= 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 1770305326126784.7188827634336; Thu, 5 Feb 2026 07:28:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vo1F1-0004cm-4Q; Thu, 05 Feb 2026 10:25:59 -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 1vo1Eg-00044i-FM for qemu-devel@nongnu.org; Thu, 05 Feb 2026 10:25:44 -0500 Received: from p-west2-cluster2-host11-snip4-3.eps.apple.com ([57.103.68.206] 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 1vo1Ee-0001wC-Mv for qemu-devel@nongnu.org; Thu, 05 Feb 2026 10:25:38 -0500 Received: from outbound.mr.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-2a-60-percent-8 (Postfix) with ESMTPS id 63A3C1800601; Thu, 5 Feb 2026 15:25:33 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.152.38]) by p00-icloudmta-asmtp-us-west-2a-60-percent-8 (Postfix) with ESMTPSA id B97E318000A4; Thu, 5 Feb 2026 15:25:28 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1770305135; x=1772897135; bh=mBFnX+1GWKubPDZlgEM1plJqBHQoJzuLiKUgkg0UYPU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=WvCgfYZiKtex0MeIDOkes6jas7wZQmpB9txNkCrjiTum0cZVKnc0JXz2ST4dsuwq5RvC53Whwr17d8WRB6sOVc4NouG+Wk8hfErvbdtw6mfPIAIhlOj8w7XCiYnC7bQUqXjjQEiCfpfNUiaE8ephhLhC2IBopGKsqvHB7Zji/86L3RQeE1zMXVXFeWaaoloNBoB8CXG5EcfMGR5OLZb60rqyGdUSn/d0CRSDJhL1E/lua2GfW6OxNSoosMl1VyNY5X4+zOoHKcyTupkJF8midRAQKk+KWMH4efozfUopgsKDUw25r7cP4X75lFNRyHKW+OEA4XLh2Tq/21qTYHyGzg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Marcel Apfelbaum , Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Phil Dennis-Jordan , Richard Henderson , Peter Maydell , Akihiko Odaki , Paolo Bonzini , Pierrick Bouvier , Cameron Esfahani , Roman Bolshakov , Pedro Barbuda , Ani Sinha , "Michael S. Tsirkin" , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-arm@nongnu.org, Zhao Liu , Igor Mammedov , Eduardo Habkost , Shannon Zhao Subject: [PATCH v22 11/22] whpx: ifdef out winhvemulation on non-x86_64 Date: Thu, 5 Feb 2026 16:24:14 +0100 Message-ID: <20260205152432.78208-12-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260205152432.78208-1-mohamed@unpredictable.fr> References: <20260205152432.78208-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=S+nUAYsP c=1 sm=1 tr=0 ts=6984b66f cx=c_apl:c_apl_out:c_pps a=9OgfyREA4BUYbbCgc0Y0oA==:117 a=9OgfyREA4BUYbbCgc0Y0oA==:17 a=IkcTkHD0fZMA:10 a=HzLeVaNsDn8A: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-Spam-Details-Enc: AW1haW4tMjYwMjA1MDExNiBTYWx0ZWRfXx3UVId7c5mGB EGbm+gZlOubzRrSTzrhSGnxNwYzAWn6n8xRVquORzSWkfQTe4PIVV4ZLs4U9lPwTypmTYypnfgf U2+FZfBGSJ/Zz4c45Zk0RnRwdNPrGpJwcZwMu7sGC++Y1EVkrxUGB4+lNaT4GHC6UVMc9arSqvU p5Idjs5s5sEgl83N9OwrJ7GZowxVykO3IfOT8z9pgfrUE3yVMxksDJzIAikGVfZfpYRqioxbeFB 3A6gV7KZ8tqwvcUeAA5OKSHl88JvkT4EAP0o9f9/N5i9avawuEDfkLs9pMaki1vPWgXD8pL3A+2 MSr1lVKHL6A4aPv9h/EIfGmGscY+dd+XOAzIpT6vH9H4t7AIUd7Nfenji3U994= X-Proofpoint-ORIG-GUID: lto8BTnaAA0eMwtBMmU4c48dz0HG8ivX X-Proofpoint-GUID: lto8BTnaAA0eMwtBMmU4c48dz0HG8ivX 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-05_03,2026-02-05_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 malwarescore=0 mlxscore=0 mlxlogscore=982 adultscore=0 lowpriorityscore=0 spamscore=0 clxscore=1030 suspectscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2602050116 X-JNJ: AAAAAAABJbIr5rpV8xKaz/PjMjmvw9ONq6hw62V+u4e71aNEQ7aC8PiFx319ATvUa63HDfQoEW8Kb7HMQ2VsalrNs9bXq3RvcoNzFXJBbeZsQzFIFNAt2yVx0OealpEzOXJn9iGaxooDVwdKrjPcRxdPkNjBGPWFHrOG/9bMzTzNVFSm2j6iChkiGREHQ1WF7a3RI5Im4zYWL+OUBnnhVBAiz5eKUQUhNtYWn7BcFguoxhnYs5cxS0Mg6Nj1AtGpIrDI8SNf2O/MkUXU4h2f0Uq3xA/D8ZPktZhohwT4253Yrvrt5oJUFmfm8WmHlk7Z43xH8zvNsg2goqBEaGHHP8aQ8alw+VQsHb4fi69bmZnG6Hw70FbzmrOvwJ5JrQSdXTzsRU0ZSXyokuobb0lBzjBcMqrIwG1e6KRy+P44UiqYC+tW93zQu/vZLievLEQMZSnrQh85ze5RyOZ7kLLyDLf4GRVBYpdSHJSHfZvKJ+SRWCVVY5Dxg4iNogP9PlAvCEPccnhIr8xWJ8Gxa8Qae4SLY0eVaYdi03o4BclVy7UKB7fmVXpVwF9/XFb68Ti4+3CpoN/XjKpsRdBmpH0OEX/ZMAcM61jeNn+ipJq5dFLiOA1g/qbZQ5M/2HZI8pSAOCpOh+qz3TpOM6sbXIMc2qJd7yBbEBYAeUH3DFpR2clP/NCxEkhA5aw7s5XwMmPhpQqTXTUXqSUH3X0c3QBoQSlenpy/nq8E0wIsjK5LJI6xTa1jUhDKgREnoy2AFXc5F7iUM/onSpHsYL9DuXrR9ulKmj9B3oKthdSXjyOQo/MA8m8gDgKy+F8ZU/0t6k0UE6c5h+2a6aLMiX4NBAiWVjHGj5KUzpoNeQlCXH95h8WUea2z9GFuJwMUWpmEkoUii20uvUDdM/t0Kp/yfwBwIeYyFJyC1uF45/jxef8SHOikLv8QqoIdUdM/WLEsCQhM 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.206; 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1770305330883154100 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)