From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Tue, 28 Oct 2025 05:42:00 +0000 (+0100)
Subject: accel/hvf: Restrict ARM specific fields of AccelCPUState
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ad756383e1bcf8001696c81f64b26f35f1af142;p=thirdparty%2Fqemu.git

accel/hvf: Restrict ARM specific fields of AccelCPUState

Do not expose ARM specific fields to X86 implementation,
allowing to use the proper 'hv_vcpu_exit_t' type.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h
index 195d64dcf1..3d2be4092e 100644
--- a/include/system/hvf_int.h
+++ b/include/system/hvf_int.h
@@ -59,10 +59,12 @@ extern HVFState *hvf_state;
 
 struct AccelCPUState {
     hvf_vcpuid fd;
-    void *exit;
+#ifdef __aarch64__
+    hv_vcpu_exit_t *exit;
     bool vtimer_masked;
     sigset_t unblock_ipi_mask;
     bool guest_debug_enabled;
+#endif
 };
 
 void assert_hvf_ok_impl(hv_return_t ret, const char *file, unsigned int line,