Commit 317134bb authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'shorne/tags/pull-or-20170504' into staging 



Openrisc Features and Fixes for qemu 2.10

# gpg: Signature made Thu 04 May 2017 01:41:45 AM BST
# gpg:                using RSA key 0xC3B31C2D5E6627E4
# gpg: Good signature from "Stafford Horne <shorne@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: D9C4 7354 AEF8 6C10 3A25  EFF1 C3B3 1C2D 5E66 27E4

* shorne/tags/pull-or-20170504:
  target/openrisc: Support non-busy idle state using PMR SPR
  target/openrisc: Remove duplicate features property
  target/openrisc: Implement full vmstate serialization
  migration: Add VMSTATE_STRUCT_2DARRAY()
  target/openrisc: implement shadow registers
  migration: Add VMSTATE_UINTTL_2DARRAY()
  target/openrisc: add numcores and coreid support
  target/openrisc: Fixes for memory debugging
  target/openrisc: Implement EPH bit
  target/openrisc: Implement EVBAR register
  MAINTAINERS: Add myself as openrisc maintainer

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 4f3652b3 f4d1414a

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ F: hw/nios2/ 
F: disas/nios2.c



OpenRISC

M: Jia Liu <proljc@gmail.com>

S: Maintained

M: Stafford Horne <shorne@gmail.com>

S: Odd Fixes

F: target/openrisc/

F: hw/openrisc/

F: tests/tcg/openrisc/

hw/openrisc/cputimer.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ void cpu_openrisc_timer_update(OpenRISCCPU *cpu) 
    }

    next = now + (uint64_t)wait * TIMER_PERIOD;

    timer_mod(cpu->env.timer, next);

    qemu_cpu_kick(CPU(cpu));

}



void cpu_openrisc_count_start(OpenRISCCPU *cpu)

include/migration/cpu.h

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
    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_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v)                \

    VMSTATE_UINT64_2DARRAY_V(_f, _s, _n1, _n2, _v)

#define VMSTATE_UINTTL_TEST(_f, _s, _t)                               \

    VMSTATE_UINT64_TEST(_f, _s, _t)

#define vmstate_info_uinttl vmstate_info_uint64
@@ -37,6 +39,8 @@ 
    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_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v)                \

    VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, _v)

#define VMSTATE_UINTTL_TEST(_f, _s, _t)                               \

    VMSTATE_UINT32_TEST(_f, _s, _t)

#define vmstate_info_uinttl vmstate_info_uint32
@@ -48,5 +52,8 @@ 
    VMSTATE_UINTTL_EQUAL_V(_f, _s, 0)

#define VMSTATE_UINTTL_ARRAY(_f, _s, _n)                              \

    VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0)

#define VMSTATE_UINTTL_2DARRAY(_f, _s, _n1, _n2)                      \

    VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, 0)





#endif

include/migration/vmstate.h

+18 −0
Original line number Diff line number Diff line
@@ -500,6 +500,19 @@ extern const VMStateInfo vmstate_info_qtailq; 
    .offset       = vmstate_offset_array(_state, _field, _type, _num),\

}



#define VMSTATE_STRUCT_2DARRAY_TEST(_field, _state, _n1, _n2, _test, \

                                    _version, _vmsd, _type) {        \

    .name         = (stringify(_field)),                             \

    .num          = (_n1) * (_n2),                                   \

    .field_exists = (_test),                                         \

    .version_id   = (_version),                                      \

    .vmsd         = &(_vmsd),                                        \

    .size         = sizeof(_type),                                   \

    .flags        = VMS_STRUCT | VMS_ARRAY,                          \

    .offset       = vmstate_offset_2darray(_state, _field, _type,    \

                                           _n1, _n2),                \

}



#define VMSTATE_STRUCT_VARRAY_UINT8(_field, _state, _field_num, _version, _vmsd, _type) { \

    .name       = (stringify(_field)),                               \

    .num_offset = vmstate_offset_value(_state, _field_num, uint8_t), \
@@ -747,6 +760,11 @@ extern const VMStateInfo vmstate_info_qtailq; 
    VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version,   \

            _vmsd, _type)



#define VMSTATE_STRUCT_2DARRAY(_field, _state, _n1, _n2, _version,    \

            _vmsd, _type)                                             \

    VMSTATE_STRUCT_2DARRAY_TEST(_field, _state, _n1, _n2, NULL,       \

            _version, _vmsd, _type)



#define VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, _info, _size) \

    VMSTATE_BUFFER_UNSAFE_INFO_TEST(_field, _state, NULL, _version, _info, \

            _size)

linux-user/elfload.c

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, 
    int i;



    for (i = 0; i < 32; i++) {

        (*regs)[i] = tswapreg(env->gpr[i]);

        (*regs)[i] = tswapreg(cpu_get_gpr(env, i));

    }

    (*regs)[32] = tswapreg(env->pc);

    (*regs)[33] = tswapreg(cpu_get_sr(env));