From nobody Mon Feb 9 19:05:11 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=1770301674; cv=none; d=zohomail.com; s=zohoarc; b=NUNgrGfIUWGSFeQjuSU9BD/8T3WfS4TKWH/Ai0st4D15997vVlwatKL4Vkd1cQTzURTQwtKej+QGwNjKOIQ/K3eZBQHf6QTDpoLSdGHFow0mlATBhcI4s1rS0psX9aquqAzoU6IjW9qJurGHnh7320wfYo+W2aeTFw+IMcxt5kY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770301674; 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=ZvZEBRWIfqPfokNBWnckTPOYOqoKvsZWxVMOPc2OBOagWV5e/fWt4/OPMBVdSdES4rllULASLK6krGbfft4oY5pKpb9YrOvrZ+fcHqYglnbHk9AWjhHU7RXsJQInhIqrLSaAR3oBR51ghqN/LCTj2QGdvJAhoCRx02i8PTueNTY= 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 1770301674508674.824823768806; Thu, 5 Feb 2026 06:27:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vo0Jk-000199-Et; Thu, 05 Feb 2026 09:26:48 -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 1vo0Ja-000133-A1 for qemu-devel@nongnu.org; Thu, 05 Feb 2026 09:26:38 -0500 Received: from qs-2003d-snip4-11.eps.apple.com ([57.103.86.43] 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 1vo0JQ-0007yL-T8 for qemu-devel@nongnu.org; Thu, 05 Feb 2026 09:26:33 -0500 Received: from outbound.qs.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-2d-100-percent-2 (Postfix) with ESMTPS id BDF801800264; Thu, 5 Feb 2026 14:26:24 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.155.37]) by p00-icloudmta-asmtp-us-east-2d-100-percent-2 (Postfix) with ESMTPSA id 440A81800D93; Thu, 5 Feb 2026 14:26:17 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1770301588; x=1772893588; bh=mBFnX+1GWKubPDZlgEM1plJqBHQoJzuLiKUgkg0UYPU=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=TcYkg/A1pZzQlH/acD2YvIUr5Ey+vvL6yYd+EkMUAk2X6nI1cTQpbwDaz8iSPP5ZDd+rF4d5V14oiJKWZEJYuN30CoMmfC+PnjSIFmzAuf0DsbjAq2TBXqX6xQTAjq59jdER30EOTosZ2hn+/b7+E8evDfApAnmqJEAsM+Krlji1JUj/5SlgnwGCCe/CL75Q6kI1X9gukmst7Q9JFKAi1feAf3X/mgKlncIgdCuRsgRTOhLBAOsFlr775pLu4Zk8TfEeatWK2XNfnzUR2vdSVecoTUgP7oRgEak3X7LJj2t9nXzj0oqfJ8H4CE/vx9y1XmArJuGrmmdE6WDm5koHRA== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Zhao Liu , Paolo Bonzini , Akihiko Odaki , Cameron Esfahani , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Shannon Zhao , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Phil Dennis-Jordan , "Michael S. Tsirkin" , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Alexander Graf , Pedro Barbuda , Yanan Wang , Ani Sinha , Igor Mammedov , Marcel Apfelbaum , Peter Maydell , Eduardo Habkost , Roman Bolshakov , Pierrick Bouvier Subject: [PATCH v21 11/22] whpx: ifdef out winhvemulation on non-x86_64 Date: Thu, 5 Feb 2026 15:25:29 +0100 Message-ID: <20260205142543.64818-12-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260205142543.64818-1-mohamed@unpredictable.fr> References: <20260205142543.64818-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 6bgapYDGBxF079P4pJiTVaQidK3iumHo X-Proofpoint-ORIG-GUID: 6bgapYDGBxF079P4pJiTVaQidK3iumHo X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjA1MDEwOCBTYWx0ZWRfX9p9GOqi7ceJH hy28DvGBfZCxlCIzaX4VSdlD7DvU0fGbWPCRhr38aI9pzu0n88K971gIc1s0ektLE7gOPq4L2t2 u/GSh3W6ZcjHmoKWYyJz9I7Ri0U1zCOpwdzM6n1f6NDm3C6E2HvvrL9vbEKb3kOYtO0sceLVgZH bPB5Hox4egs/6zWM8fzxFsWwBfVAAYkrSkwaUYcTH8Wm2k8shtUhuda5g0gXNcqdQOyzJohIZMb Kj/MNFNb5MFAnqss7mN/lqIaHucGpxAEZFNjL3OK3fAGE3e0afHx0f5d6DVeMIkHvpLuUtdVm4R 6Ur43RxsOy4j+Bnq2hvRcIM6jvK4Eb8LHv2ttEa1w0AIPtzP+LpoT0Dip8bHOA= X-Authority-Info-Out: v=2.4 cv=aN39aL9m c=1 sm=1 tr=0 ts=6984a892 cx=c_apl:c_apl_out:c_pps a=bsP7O+dXZ5uKcj+dsLqiMw==:117 a=bsP7O+dXZ5uKcj+dsLqiMw==: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-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 suspectscore=0 mlxlogscore=982 phishscore=0 spamscore=0 clxscore=1030 adultscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2602050108 X-JNJ: AAAAAAAB4zlniXRxQ/QXnvMCnhvi+RvQxQtIHkcA67CFAvF+jZi3hTWdob41GxeKfoU+gOHHz90oez5tf4D3GfMxgiMcJyfXx0ICKU5u4unRkKlKWc89JlVbu7F205M9bhYKdlPqksfgVqY9ERRq+biu8dIVjGsrZ4pK4zdmO8zKKki7zcW7ScOp8SX/HHTPExdugsZavvLynckgStO/aP0pD5tuQt9tv8sfqSluLEbMUzy77+8mEiyZzgHlBHunH+fKkQKLdnajRyIqiSzPmOO3p0R9ynoPFNwJy7SWrpDSJYXWCFbkklfs82ipimW3GEK+wWrkAjL4M/t7GCT3lTphwlUmLQ1uC/L0DTwZqBI4RceJ/t5NG96WS6K4GZ+QfrNOYoi37zeNAzoruMQBu8EPtUzBOJ5iTTqPrhWsHxoPrLZgbFskeSLlb+pkcHeslfNg5mxmjOSMQ72KmHNTDX6M/pyhh11/1KofaPVSFY5xcHi6X/D5N8bTq5unhbifSKKwEdmFsmUSUDxbxp7Wk6gK7En1UQTZfpm84Ul0Fooq8GdQjPOBn7xo8fRssSutVdNWCemKQpGA/haPYT0Yux+ydk52NkGmk7HrODWpLD4bvzBUHo1F+UELZlB4VWqh6F/J9gbrRWbnJpX+b8GEW6zdJJsOGx0p8rXkmZdCOao3iwo2rbuGjwfmaN82ypHhyhcJq99ygzbCHx+iqTm94iqjOMC7Bs6TYl4T0nJPuhFDZuN6fOvUZtiQXhcnnm4N2ukMal/PUYU36H57iR1Ma8Cfh/Up11iO7NOkxdTm5KlPnaXU5K70fUEDgFZBnfZjKxv65JH37Fv4EPaSToEQOoTw7v5F3urhkwuYlZ+r/FfrL6SciqAyoCJR31SEHe6gEbODLvtIfsC99w67mMT8ohVQeDGbpGDuszX0+UR2ZvxHgeHt7Xxcqv8bOQaRLBeG+g== 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.86.43; 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_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: 1770301677012158500 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)