Commit 602131e9 authored by Peter Maydell's avatar Peter Maydell
Browse files

target-arm: Add some missing CPU state fields to VMState 



A number of CPU state fields were accidentally omitted from
our migration state: some OMAP specific cp15 registers, and 
some related to state for load/store exclusive insns. Add them.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 3cc1d208

target-arm/machine.c

+10 −3
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ static const VMStateInfo vmstate_cpsr = { 


const VMStateDescription vmstate_arm_cpu = {

    .name = "cpu",

    .version_id = 10,

    .minimum_version_id = 10,

    .minimum_version_id_old = 10,

    .version_id = 11,

    .minimum_version_id = 11,

    .minimum_version_id_old = 11,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32_ARRAY(env.regs, ARMCPU, 16),

        {
@@ -172,9 +172,16 @@ const VMStateDescription vmstate_arm_cpu = { 
        VMSTATE_UINT32(env.cp15.c13_tls2, ARMCPU),

        VMSTATE_UINT32(env.cp15.c13_tls3, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_cpar, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_ticonfig, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_i_max, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_i_min, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_threadid, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_power_control, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_diagnostic, ARMCPU),

        VMSTATE_UINT32(env.cp15.c15_power_diagnostic, ARMCPU),

        VMSTATE_UINT32(env.exclusive_addr, ARMCPU),

        VMSTATE_UINT32(env.exclusive_val, ARMCPU),

        VMSTATE_UINT32(env.exclusive_high, ARMCPU),

        VMSTATE_UINT64(env.features, ARMCPU),

        VMSTATE_END_OF_LIST()

    },