Commit acf57591 authored by Stafford Horne's avatar Stafford Horne
Browse files

target/openrisc: Implement full vmstate serialization 



Previously serialization did not persist the tlb, timer, pic and other
key state items.  This meant snapshotting and restoring a running os
would crash. After adding these I am able to take snapshots of a
running linux os and restore at a later time.

I am currently not trying to maintain capatibility with older versions
as I do not believe this really worked before or anyone used it.

Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
parent b75c958d

target/openrisc/machine.c

+71 −2
Original line number Diff line number Diff line
@@ -24,6 +24,63 @@ 
#include "hw/boards.h"

#include "migration/cpu.h"



static int env_post_load(void *opaque, int version_id)

{

    CPUOpenRISCState *env = opaque;



    /* Restore MMU handlers */

    if (env->sr & SR_DME) {

        env->tlb->cpu_openrisc_map_address_data =

            &cpu_openrisc_get_phys_data;

    } else {

        env->tlb->cpu_openrisc_map_address_data =

            &cpu_openrisc_get_phys_nommu;

    }



    if (env->sr & SR_IME) {

        env->tlb->cpu_openrisc_map_address_code =

            &cpu_openrisc_get_phys_code;

    } else {

        env->tlb->cpu_openrisc_map_address_code =

            &cpu_openrisc_get_phys_nommu;

    }





    return 0;

}



static const VMStateDescription vmstate_tlb_entry = {

    .name = "tlb_entry",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINTTL(mr, OpenRISCTLBEntry),

        VMSTATE_UINTTL(tr, OpenRISCTLBEntry),

        VMSTATE_END_OF_LIST()

    }

};



static const VMStateDescription vmstate_cpu_tlb = {

    .name = "cpu_tlb",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_STRUCT_2DARRAY(itlb, CPUOpenRISCTLBContext,

                             ITLB_WAYS, ITLB_SIZE, 0,

                             vmstate_tlb_entry, OpenRISCTLBEntry),

        VMSTATE_STRUCT_2DARRAY(dtlb, CPUOpenRISCTLBContext,

                             DTLB_WAYS, DTLB_SIZE, 0,

                             vmstate_tlb_entry, OpenRISCTLBEntry),

        VMSTATE_END_OF_LIST()

    }

};



#define VMSTATE_CPU_TLB(_f, _s)                             \

    VMSTATE_STRUCT_POINTER(_f, _s, vmstate_cpu_tlb, CPUOpenRISCTLBContext)





static int get_sr(QEMUFile *f, void *opaque, size_t size, VMStateField *field)

{

    CPUOpenRISCState *env = opaque;
@@ -47,8 +104,9 @@ static const VMStateInfo vmstate_sr = { 


static const VMStateDescription vmstate_env = {

    .name = "env",

    .version_id = 5,

    .minimum_version_id = 5,

    .version_id = 6,

    .minimum_version_id = 6,

    .post_load = env_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_UINTTL_2DARRAY(shadow_gpr, CPUOpenRISCState, 16, 32),

        VMSTATE_UINTTL(pc, CPUOpenRISCState),
@@ -79,9 +137,20 @@ static const VMStateDescription vmstate_env = { 
        VMSTATE_UINT32(cpucfgr, CPUOpenRISCState),

        VMSTATE_UINT32(dmmucfgr, CPUOpenRISCState),

        VMSTATE_UINT32(immucfgr, CPUOpenRISCState),

        VMSTATE_UINT32(evbar, CPUOpenRISCState),

        VMSTATE_UINT32(esr, CPUOpenRISCState),

        VMSTATE_UINT32(fpcsr, CPUOpenRISCState),

        VMSTATE_UINT64(mac, CPUOpenRISCState),



        VMSTATE_CPU_TLB(tlb, CPUOpenRISCState),



        VMSTATE_TIMER_PTR(timer, CPUOpenRISCState),

        VMSTATE_UINT32(ttmr, CPUOpenRISCState),

        VMSTATE_UINT32(ttcr, CPUOpenRISCState),



        VMSTATE_UINT32(picmr, CPUOpenRISCState),

        VMSTATE_UINT32(picsr, CPUOpenRISCState),



        VMSTATE_END_OF_LIST()

    }

};