Commit 4aaddc29 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging 



qemu-sparc update

# gpg: Signature made Sat 16 Jan 2016 12:32:06 GMT using RSA key ID AE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"

* remotes/mcayland/tags/qemu-sparc-signed:
  target-sparc: Migrate CWP and PIL for SPARC64
  target-sparc: Use VMState arrays for SPARC64 TLB/MMU state
  target-sparc: Convert to VMStateDescription
  target-sparc: Don't flush TLB in cpu_load function
  target-sparc: Split cpu_put_psr into side-effect and no-side-effect parts
  vmstate: define vmstate_info_uinttl
  vmstate: Introduce VMSTATE_VARRAY_MULTPLY
  vmstate: introduce CPU_DoubleU arrays

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 19b6d843 6d532244

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)

include/hw/hw.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); 
    VMSTATE_UINT64_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v)

#define vmstate_info_uinttl vmstate_info_uint64

#else

#define VMSTATE_UINTTL_V(_f, _s, _v)                                  \

    VMSTATE_UINT32_V(_f, _s, _v)
@@ -56,6 +57,7 @@ void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); 
    VMSTATE_UINT32_EQUAL_V(_f, _s, _v)

#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v)                        \

    VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v)

#define vmstate_info_uinttl vmstate_info_uint32

#endif

#define VMSTATE_UINTTL(_f, _s)                                        \

    VMSTATE_UINTTL_V(_f, _s, 0)

include/migration/vmstate.h

+18 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ enum VMStateFlags { 
    VMS_VARRAY_UINT32    = 0x800,  /* Array with size in uint32_t field*/

    VMS_MUST_EXIST       = 0x1000, /* Field must exist in input */

    VMS_ALLOC            = 0x2000, /* Alloc a buffer on the destination */

    VMS_MULTIPLY_ELEMENTS = 0x4000, /* multiply varray size by field->num */

};



typedef struct {
@@ -156,6 +157,7 @@ extern const VMStateInfo vmstate_info_uint32; 
extern const VMStateInfo vmstate_info_uint64;



extern const VMStateInfo vmstate_info_float64;

extern const VMStateInfo vmstate_info_cpudouble;



extern const VMStateInfo vmstate_info_timer;

extern const VMStateInfo vmstate_info_buffer;
@@ -245,6 +247,16 @@ extern const VMStateInfo vmstate_info_bitmap; 
    .offset     = vmstate_offset_2darray(_state, _field, _type, _n1, _n2),  \

}



#define VMSTATE_VARRAY_MULTIPLY(_field, _state, _field_num, _multiply, _info, _type) { \

    .name       = (stringify(_field)),                               \

    .num_offset = vmstate_offset_value(_state, _field_num, uint32_t),\

    .num        = (_multiply),                                       \

    .info       = &(_info),                                          \

    .size       = sizeof(_type),                                     \

    .flags      = VMS_VARRAY_UINT32|VMS_MULTIPLY_ELEMENTS,           \

    .offset     = offsetof(_state, _field),                          \

}



#define VMSTATE_ARRAY_TEST(_field, _state, _num, _test, _info, _type) {\

    .name         = (stringify(_field)),                              \

    .field_exists = (_test),                                          \
@@ -781,6 +793,12 @@ extern const VMStateInfo vmstate_info_bitmap; 
#define VMSTATE_FLOAT64_ARRAY(_f, _s, _n)                             \

    VMSTATE_FLOAT64_ARRAY_V(_f, _s, _n, 0)



#define VMSTATE_CPUDOUBLE_ARRAY_V(_f, _s, _n, _v)                     \

    VMSTATE_ARRAY(_f, _s, _n, _v, vmstate_info_cpudouble, CPU_DoubleU)



#define VMSTATE_CPUDOUBLE_ARRAY(_f, _s, _n)                           \

    VMSTATE_CPUDOUBLE_ARRAY_V(_f, _s, _n, 0)



#define VMSTATE_BUFFER_V(_f, _s, _v)                                  \

    VMSTATE_STATIC_BUFFER(_f, _s, _v, NULL, 0, sizeof(typeof_field(_s, _f)))

migration/vmstate.c

+27 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ static int vmstate_n_elems(void *opaque, VMStateField *field) 
        n_elems = *(uint8_t *)(opaque+field->num_offset);

    }



    if (field->flags & VMS_MULTIPLY_ELEMENTS) {

        n_elems *= field->num;

    }



    return n_elems;

}
@@ -794,6 +798,29 @@ const VMStateInfo vmstate_info_float64 = { 
    .put  = put_float64,

};



/* CPU_DoubleU type */



static int get_cpudouble(QEMUFile *f, void *pv, size_t size)

{

    CPU_DoubleU *v = pv;

    qemu_get_be32s(f, &v->l.upper);

    qemu_get_be32s(f, &v->l.lower);

    return 0;

}



static void put_cpudouble(QEMUFile *f, void *pv, size_t size)

{

    CPU_DoubleU *v = pv;

    qemu_put_be32s(f, &v->l.upper);

    qemu_put_be32s(f, &v->l.lower);

}



const VMStateInfo vmstate_info_cpudouble = {

    .name = "CPU_Double_U",

    .get  = get_cpudouble,

    .put  = put_cpudouble,

};



/* uint8_t buffers */



static int get_buffer(QEMUFile *f, void *pv, size_t size)

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);