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

target/arm: Migrate v7m.other_sp 



In commit abc24d86 we accidentally broke migration of
the stack pointer value for the mode (process, handler) the CPU
is not currently running as. (The commit correctly removed the
no-longer-used v7m.current_sp flag from the VMState but also
deleted the still very much in use v7m.other_sp SP value field.)

Add a subsection to migrate it again. (We don't need to care
about trying to retain compatibility with pre-abc24d86
versions of QEMU, because that commit bumped the version_id
and we've since bumped it again a couple of times.)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20180209165810.6668-11-peter.maydell@linaro.org
parent 47825770

target/arm/machine.c

+11 −0
Original line number Diff line number Diff line
@@ -236,6 +236,16 @@ static const VMStateDescription vmstate_m_scr = { 
    }

};



static const VMStateDescription vmstate_m_other_sp = {

    .name = "cpu/m/other-sp",

    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(env.v7m.other_sp, ARMCPU),

        VMSTATE_END_OF_LIST()

    }

};



static const VMStateDescription vmstate_m = {

    .name = "cpu/m",

    .version_id = 4,
@@ -259,6 +269,7 @@ static const VMStateDescription vmstate_m = { 
        &vmstate_m_faultmask_primask,

        &vmstate_m_csselr,

        &vmstate_m_scr,

        &vmstate_m_other_sp,

        NULL

    }

};