Commit b21fa1218d for qemu.org

commit b21fa1218d8976241f32c463f4c96f6245876c64
Author: Mohamed Mediouni <mohamed@unpredictable.fr>
Date:   Tue Feb 10 11:34:49 2026 +0000

    whpx: enable arm64 builds

    Signed-off-by: Mohamed Mediouni <mohamed@unpredictable.fr>

    Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
    Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --git a/meson.build b/meson.build
index 2d114e9018..e8fd77aac0 100644
--- a/meson.build
+++ b/meson.build
@@ -301,7 +301,8 @@ accelerator_targets += { 'CONFIG_XEN': xen_targets }

 if cpu == 'aarch64'
   accelerator_targets += {
-    'CONFIG_HVF': ['aarch64-softmmu']
+    'CONFIG_HVF': ['aarch64-softmmu'],
+    'CONFIG_WHPX': ['aarch64-softmmu']
   }
 elif cpu == 'x86_64'
   accelerator_targets += {
@@ -858,13 +859,18 @@ if get_option('mshv').allowed() and host_os == 'linux'
 endif

 if get_option('whpx').allowed() and host_os == 'windows'
-  if get_option('whpx').enabled() and host_machine.cpu() != 'x86_64'
-    error('WHPX requires 64-bit host')
-  elif cc.has_header('winhvplatform.h', required: get_option('whpx')) and \
-       cc.has_header('winhvemulation.h', required: get_option('whpx'))
-    accelerators += 'CONFIG_WHPX'
+  if cpu == 'i386'
+    if get_option('whpx').enabled()
+     error('WHPX requires 64-bit host')
+    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'))
+      accelerators += 'CONFIG_WHPX'
+    endif
   endif
-endif
+ endif

 hvf = not_found
 if get_option('hvf').allowed()