From nobody Sat Nov 15 09:10:11 2025 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=1754322646; cv=none; d=zohomail.com; s=zohoarc; b=KGimEzlpg35mEHLArKWrJrkT4w+XME6HPsOCYA6isLzIjfuPtCssZLum1fMC2ply1ffE3FEDfStl6fP3QLD2anvKl1m+PcfV3I3XVInuLOuEJAMicOlVFBJSGrBAo5iy/HhHQyF5RNjEYrvZTzWL+aZWuvyaiM3qxASBv9+u3Eg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754322646; 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=G1XeInTOt4Nk6l9h3UXUsDeo0KoG5/UIgP9T4DoOwGM=; b=QUtQNUI0ZrwQiKF6nbszGwMVFW+0Ty65pGa0v3Pf89o++lxpS0b0RtEbUemdbu6Xpnxcf17JvtX9IEragsz2kKpsdKbZRU3naX2BJs6I243kKGP56c59xjqB5N2guvuHZQR/8wBQOj7EgmrUGnm9y5giG5wEKdFLRChBx7LC6XM= 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 1754322646465636.6736661421207; Mon, 4 Aug 2025 08:50:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uixSK-0005Ln-2U; Mon, 04 Aug 2025 11:50:32 -0400 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 1uiw6e-0005UL-Sy for qemu-devel@nongnu.org; Mon, 04 Aug 2025 10:24:17 -0400 Received: from p-east3-cluster6-host4-snip4-10.eps.apple.com ([57.103.85.171] helo=outbound.qs.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uiw6R-0000Jb-60 for qemu-devel@nongnu.org; Mon, 04 Aug 2025 10:23:59 -0400 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-10-percent-0 (Postfix) with ESMTPS id 5523C180009E; Mon, 4 Aug 2025 14:23:46 +0000 (UTC) Received: from localhost.localdomain (qs-asmtp-me-k8s.p00.prod.me.com [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-10-percent-0 (Postfix) with ESMTPSA id B4081180134F; Mon, 4 Aug 2025 14:23:42 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=G1XeInTOt4Nk6l9h3UXUsDeo0KoG5/UIgP9T4DoOwGM=; h=From:To:Subject:Date:Message-Id:MIME-Version:x-icloud-hme; b=E4tdMTcV9gwGcZJPQ2WLRQewPcKMEjsFZOFIycuW2GsAcf8RWtsDYrweNfXkkKcHRh3jsNm0GePrZibpbLYVZgCgeG3A6cgn2B7Q5eUKG/S7AgJxy5JsN8o157Wrjn0xohbLsymOvZvkRAx/CudZhJ99lcqKJ6UAuy6GjlE2ewyOwNqKM7WZonVTFWuhAcK63AQxz73Ia0G0yyqd4CU/PB9sjXmlptpNscHfwjK7cxyJztaCNY/SJU2dC3ng/rF88pm/q9KRsYH9/ePoiP8ntCUQJ/wWbF5xUBRJdAkl53e8JVcnT7Z9dfCdoKJ5039GbOEh0lymeumEzX9uqSn2dw== X-Client-IP: 46.189.47.18 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: Shannon Zhao , Ani Sinha , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Phil Dennis-Jordan , Roman Bolshakov , Igor Mammedov , Eduardo Habkost , Mohamed Mediouni , Mads Ynddal , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Sunil Muthuswamy , Zhao Liu , "Michael S. Tsirkin" , Alexander Graf , qemu-arm@nongnu.org, Peter Maydell , Marcel Apfelbaum , Yanan Wang , Richard Henderson , Cameron Esfahani , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v4 05/17] whpx: ifdef out winhvemulation on non-x86_64 Date: Mon, 4 Aug 2025 16:23:14 +0200 Message-Id: <20250804142326.72947-6-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250804142326.72947-1-mohamed@unpredictable.fr> References: <20250804142326.72947-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: P5qPp2UuI1NLg0aK8wpN0YcSGB75WRDd X-Proofpoint-ORIG-GUID: P5qPp2UuI1NLg0aK8wpN0YcSGB75WRDd X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODA0MDA4MCBTYWx0ZWRfX5e4ou1x7C8ki W6PkizO2qAGWVEhGrLya6RIZjM3zXbPEpyZdy9XPG9clxNQu+1G23ENq/aiKwzXfIf2ihdGOb77 JvC/ALCI8smKwZAm8K2jo8iwB8LoDr63vMXoYx1OlSJ8xs8HlhsCxmoKKZIyJs1Qb44qZ5eGK4m YiNGWJLHylDcFfvDoOGAqssZQ6aulXPwKp8XLmHjo4PEogFu8jgIKHBvS4ZxgVk7i3rlpsMl/XR 57zYOZDfnD/w77ky4x3Lo2zshNa+woJGQH/PJLfUW1UNJ5MqEidc8rCtsvByvRNB1kfOGxMf8= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-04_06,2025-08-04_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 clxscore=1030 phishscore=0 mlxlogscore=578 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2508040080 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.85.171; envelope-from=mohamed@unpredictable.fr; helo=outbound.qs.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=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: 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: 1754322647366124100 Content-Type: text/plain; charset="utf-8" winhvemulation is x86_64 only. In the future, we might want to get rid of winhvemulation usage entirely. Signed-off-by: Mohamed Mediouni --- accel/whpx/whpx-common.c | 16 ++++++++++++---- include/system/whpx-common.h | 2 ++ include/system/whpx-internal.h | 7 ++++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index b5e5fda696..e2d692126a 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -41,7 +41,9 @@ bool whpx_allowed; static bool whp_dispatch_initialized; static HMODULE hWinHvPlatform; +#ifdef __x86_64__ static HMODULE hWinHvEmulation; +#endif =20 struct whpx_state whpx_global; struct WHPDispatch whp_dispatch; @@ -141,9 +143,7 @@ int whpx_first_vcpu_starting(CPUState *cpu) */ int whpx_last_vcpu_stopping(CPUState *cpu) { -#ifdef __x86_64__ whpx_apply_breakpoints(whpx_global.breakpoints.breakpoints, cpu, false= ); -#endif return 0; } =20 @@ -238,8 +238,10 @@ void whpx_destroy_vcpu(CPUState *cpu) struct whpx_state *whpx =3D &whpx_global; =20 whp_dispatch.WHvDeleteVirtualProcessor(whpx->partition, cpu->cpu_index= ); +#ifdef __x86_64__ AccelCPUState *vcpu =3D cpu->accel; whp_dispatch.WHvEmulatorDestroyEmulator(vcpu->emulator); +#endif g_free(cpu->accel); } =20 @@ -414,8 +416,12 @@ static bool load_whp_dispatch_fns(HMODULE *handle, LIST_WINHVPLATFORM_FUNCTIONS(WHP_LOAD_FIELD) break; case WINHV_EMULATION_FNS_DEFAULT: +#ifdef __x86_64__ WHP_LOAD_LIB(WINHV_EMULATION_DLL, hLib) LIST_WINHVEMULATION_FUNCTIONS(WHP_LOAD_FIELD) +#else + abort(); +#endif break; case WINHV_PLATFORM_FNS_SUPPLEMENTAL: WHP_LOAD_LIB(WINHV_PLATFORM_DLL, hLib) @@ -541,11 +547,11 @@ bool init_whp_dispatch(void) if (!load_whp_dispatch_fns(&hWinHvPlatform, WINHV_PLATFORM_FNS_DEFAULT= )) { goto error; } - +#ifdef __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; @@ -555,9 +561,11 @@ error: if (hWinHvPlatform) { FreeLibrary(hWinHvPlatform); } +#ifdef __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..7a7c607e0a 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 __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 e61375d554..e57d2c8526 100644 --- a/include/system/whpx-internal.h +++ b/include/system/whpx-internal.h @@ -4,8 +4,9 @@ =20 #include #include +#ifdef __x86_64__ #include - +#endif typedef enum WhpxBreakpointState { WHPX_BP_CLEARED =3D 0, WHPX_BP_SET_PENDING, @@ -98,12 +99,16 @@ void whpx_apic_get(DeviceState *s); =20 /* Define function typedef */ LIST_WINHVPLATFORM_FUNCTIONS(WHP_DEFINE_TYPE) +#ifdef __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 __x86_64__ LIST_WINHVEMULATION_FUNCTIONS(WHP_DECLARE_MEMBER) +#endif LIST_WINHVPLATFORM_FUNCTIONS_SUPPLEMENTAL(WHP_DECLARE_MEMBER) }; =20 --=20 2.39.5 (Apple Git-154)