Commit 6d532244 authored by Peter Maydell's avatar Peter Maydell Committed by Mark Cave-Ayland
Browse files

target-sparc: Migrate CWP and PIL for SPARC64 



In SPARC32 the env->cwp and env->psrpil state is part of the PSR
register, and gets migrated as part of that register.
In SPARC64 this state is in separate CWP and PIL registers, but we
were not doing anything to migrate those.

Add the missing fields to the migration vmstate (which is a
migration break, but without these fields migration is completely
broken anyway).

This change means that trying a save/load of a SPARC64 target at
the boot rom prompt now produces a system which at least responds
to keyboard input after the restore.

Reported-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
parent 0e88d45a

target-sparc/machine.c

+4 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void cpu_pre_save(void *opaque) 
#ifndef TARGET_SPARC64

#define SPARC_VMSTATE_VER 7

#else

#define SPARC_VMSTATE_VER 8

#define SPARC_VMSTATE_VER 9

#endif



const VMStateDescription vmstate_sparc_cpu = {
@@ -181,6 +181,9 @@ const VMStateDescription vmstate_sparc_cpu = { 
        VMSTATE_UINT64(env.hstick_cmpr, SPARCCPU),

        VMSTATE_UINT64(env.ssr, SPARCCPU),

        VMSTATE_CPU_TIMER(env.hstick, SPARCCPU),

        /* On SPARC32 env.psrpil and env.cwp are migrated as part of the PSR */

        VMSTATE_UINT32(env.psrpil, SPARCCPU),

        VMSTATE_UINT32(env.cwp, SPARCCPU),

#endif

        VMSTATE_END_OF_LIST()

    },