Message ID | 20180209165810.6668-10-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | v8m: minor missing regs and bugfixes | expand |
On 02/09/2018 08:58 AM, Peter Maydell wrote: > In commit commit 3b2e934463121 we added support for the AIRCR > register holding state, but forgot to add it to the vmstate > structs. Since it only holds r/w state if the security extension > is implemented, we can just add it to vmstate_m_security. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > target/arm/machine.c | 4 ++++ > 1 file changed, 4 insertions(+) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/machine.c b/target/arm/machine.c index 30fb1454a6..25cdf4d581 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -423,6 +423,10 @@ static const VMStateDescription vmstate_m_security = { VMSTATE_VALIDATE("SAU_RNR is valid", sau_rnr_vmstate_validate), VMSTATE_UINT32(env.sau.ctrl, ARMCPU), VMSTATE_UINT32(env.v7m.scr[M_REG_S], ARMCPU), + /* AIRCR is not secure-only, but our implementation is R/O if the + * security extension is unimplemented, so we migrate it here. + */ + VMSTATE_UINT32(env.v7m.aircr, ARMCPU), VMSTATE_END_OF_LIST() } };
In commit commit 3b2e934463121 we added support for the AIRCR register holding state, but forgot to add it to the vmstate structs. Since it only holds r/w state if the security extension is implemented, we can just add it to vmstate_m_security. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target/arm/machine.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.16.1