Commit 183543cd authored by Peter Maydell's avatar Peter Maydell Committed by Stefan Hajnoczi
Browse files

target-moxie: Fix VMState registration 



Register the CPU VMState in the correct way, via cpu_class_set_vmsd(),
rather than doing it in two different wrong ways (once by providing
cpu_save and cpu_load functions, and once by setting the vmsd field in
DeviceClass).

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 93b48c20

target-moxie/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data) 


    cc->class_by_name = moxie_cpu_class_by_name;



    dc->vmsd = &vmstate_moxie_cpu;

    cpu_class_set_vmsd(cc, &vmstate_moxie_cpu);

    cc->do_interrupt = moxie_cpu_do_interrupt;

}

target-moxie/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 


#define TARGET_HAS_ICE 1



#define CPU_SAVE_VERSION 1



#define ELF_MACHINE     0xFEED /* EM_MOXIE */



#define MOXIE_EX_DIV0        0

target-moxie/machine.c

+1 −11
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


const VMStateDescription vmstate_moxie_cpu = {

    .name = "cpu",

    .version_id = CPU_SAVE_VERSION,

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields      = (VMStateField[]) {
@@ -16,13 +16,3 @@ const VMStateDescription vmstate_moxie_cpu = { 
        VMSTATE_END_OF_LIST()

    }

};
 


void cpu_save(QEMUFile *f, void *opaque)

{

    vmstate_save_state(f, &vmstate_moxie_cpu, opaque);

}



int cpu_load(QEMUFile *f, void *opaque, int version_id)

{

    return vmstate_load_state(f, &vmstate_moxie_cpu, opaque, version_id);

}