On 2/7/23 05:00, Peter Maydell wrote:
static inline bool arm_is_secure(CPUARMState *env) { - if (arm_is_el3_or_mon(env)) { - return true; - } - return arm_is_secure_below_el3(env); + ARMSecuritySpace ss = arm_security_space(env); + return ss == ARMSS_Secure || ss == ARMSS_Root;maybe return arm_space_is_secure(arm_security_space(env));
Quite right; arm_space_is_secure was something I added later, and failed to propagate completely.
+#ifndef CONFIG_USER_ONLY +ARMSecuritySpace arm_security_space(CPUARMState *env) +{ + if (!arm_feature(env, ARM_FEATURE_EL3)) {The old code had a comment - /* If EL3 is not supported then the secure state is implementation - * defined, in which case QEMU defaults to non-secure. which should probably go here I guess.
Ok. r~
