Commit df32c8d4 authored by Juan Quintela's avatar Juan Quintela Committed by Mark Cave-Ayland
Browse files

target-sparc: Convert to VMStateDescription 



Convert the SPARC CPU from cpu_load/save functions to VMStateDescription.
We preserve migration compatibility with the previous version
(required for SPARC32 but not necessarily for SPARC64).

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
[PMM:
 * Rebase and update to apply to master
 * VMSTATE_STRUCT_POINTER now takes type, not pointer-to-type
 * QEMUTimer* are migrated via VMSTATE_TIMER_PTR
 * Put CPUTimer vmstate struct inside TARGET_SPARC64 ifdef
 * Convert handling of PSR to use a vmstate_psr, like Alpha and ARM
]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
parent 232afac1

hw/sparc64/sun4u.c

+0 −24
Original line number Diff line number Diff line
@@ -358,30 +358,6 @@ typedef struct ResetData { 
    uint64_t prom_addr;

} ResetData;



void cpu_put_timer(QEMUFile *f, CPUTimer *s)

{

    qemu_put_be32s(f, &s->frequency);

    qemu_put_be32s(f, &s->disabled);

    qemu_put_be64s(f, &s->disabled_mask);

    qemu_put_be32s(f, &s->npt);

    qemu_put_be64s(f, &s->npt_mask);

    qemu_put_sbe64s(f, &s->clock_offset);



    timer_put(f, s->qtimer);

}



void cpu_get_timer(QEMUFile *f, CPUTimer *s)

{

    qemu_get_be32s(f, &s->frequency);

    qemu_get_be32s(f, &s->disabled);

    qemu_get_be64s(f, &s->disabled_mask);

    qemu_get_be32s(f, &s->npt);

    qemu_get_be64s(f, &s->npt_mask);

    qemu_get_sbe64s(f, &s->clock_offset);



    timer_get(f, s->qtimer);

}



static CPUTimer *cpu_timer_create(const char *name, SPARCCPU *cpu,

                                  QEMUBHFunc *cb, uint32_t frequency,

                                  uint64_t disabled_mask, uint64_t npt_mask)

target-sparc/cpu-qom.h

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ static inline SPARCCPU *sparc_env_get_cpu(CPUSPARCState *env) 


#define ENV_OFFSET offsetof(SPARCCPU, env)



#ifndef CONFIG_USER_ONLY

extern const struct VMStateDescription vmstate_sparc_cpu;

#endif



void sparc_cpu_do_interrupt(CPUState *cpu);

void sparc_cpu_dump_state(CPUState *cpu, FILE *f,

                          fprintf_function cpu_fprintf, int flags);

target-sparc/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -855,6 +855,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) 
    cc->do_unassigned_access = sparc_cpu_unassigned_access;

    cc->do_unaligned_access = sparc_cpu_do_unaligned_access;

    cc->get_phys_page_debug = sparc_cpu_get_phys_page_debug;

    cc->vmsd = &vmstate_sparc_cpu;

#endif

    cc->disas_set_info = cpu_sparc_disas_set_info;

target-sparc/cpu.h

+0 −6
Original line number Diff line number Diff line
@@ -374,10 +374,6 @@ struct CPUTimer 


typedef struct CPUTimer CPUTimer;



struct QEMUFile;

void cpu_put_timer(struct QEMUFile *f, CPUTimer *s);

void cpu_get_timer(struct QEMUFile *f, CPUTimer *s);



typedef struct CPUSPARCState CPUSPARCState;



struct CPUSPARCState {
@@ -599,8 +595,6 @@ int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc); 
#define cpu_signal_handler cpu_sparc_signal_handler

#define cpu_list sparc_cpu_list



#define CPU_SAVE_VERSION 7



/* MMU modes definitions */

#if defined (TARGET_SPARC64)

#define MMU_USER_IDX   0

target-sparc/machine.c

+444 −197

File changed.

Preview size limit exceeded, changes collapsed.