Commit 47825770 authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Add AIRCR to vmstate struct 



In commit commit 3b2e9344 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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20180209165810.6668-10-peter.maydell@linaro.org
parent 12fbf1a1

target/arm/machine.c

+4 −0
Original line number Diff line number Diff line
@@ -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()

    }

};