From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Mon, 6 Feb 2023 22:34:58 +0000 (+0100)
Subject: target/arm: Restrict CPUARMState::gicv3state to sysemu
X-Git-Tag: v8.0.0-rc0~57^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1701d70e15ef7337f467d1daaecee8f6d17535aa;p=thirdparty%2Fqemu.git

target/arm: Restrict CPUARMState::gicv3state to sysemu

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

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 1c1e0334f01..002082eb5b6 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -769,9 +769,10 @@ typedef struct CPUArchState {
 
     void *nvic;
     const struct arm_boot_info *boot_info;
+#if !defined(CONFIG_USER_ONLY)
     /* Store GICv3CPUState to access from this struct */
     void *gicv3state;
-#if defined(CONFIG_USER_ONLY)
+#else /* CONFIG_USER_ONLY */
     /* For usermode syscall translation.  */
     bool eabi;
 #endif /* CONFIG_USER_ONLY */