Failed in applying to current master (
apply log)
 
 
    
    
        hw/core/loader.c            |  10 ++--
hw/mips/mips_malta.c        |   6 +-
hw/s390x/Makefile.objs      |   3 +
hw/s390x/ipl.c              |  26 ++++++---
hw/s390x/s390-virtio-ccw.c  |  59 ++------------------
hw/s390x/tod-kvm.c          |  64 ++++++++++++++++++++++
hw/s390x/tod-qemu.c         |  87 +++++++++++++++++++++++++++++
hw/s390x/tod.c              | 130 ++++++++++++++++++++++++++++++++++++++++++++
hw/sparc/sun4m.c            |   4 +-
hw/sparc64/sun4u.c          |   4 +-
include/hw/loader.h         |   2 +-
include/hw/s390x/tod.h      |  65 ++++++++++++++++++++++
include/sysemu/sysemu.h     |   4 ++
target/arm/cpu.c            |   2 +-
target/s390x/Makefile.objs  |   1 +
target/s390x/cpu.c          |  57 ++++---------------
target/s390x/cpu.h          |   4 --
target/s390x/gen-features.c |   2 +
target/s390x/helper.h       |   1 +
target/s390x/insn-data.def  |   3 +-
target/s390x/internal.h     |  15 -----
target/s390x/kvm-stub.c     |   4 +-
target/s390x/kvm.c          |  27 ++++++---
target/s390x/kvm_s390x.h    |   6 +-
target/s390x/machine.c      |   6 ++
target/s390x/misc_helper.c  |  66 ++++++++++++++++++----
target/s390x/tcg-stub.c     |  20 +++++++
target/s390x/tcg_s390x.h    |  18 ++++++
target/s390x/translate.c    |   9 +++
vl.c                        |   4 +-
30 files changed, 543 insertions(+), 166 deletions(-)
create mode 100644 hw/s390x/tod-kvm.c
create mode 100644 hw/s390x/tod-qemu.c
create mode 100644 hw/s390x/tod.c
create mode 100644 include/hw/s390x/tod.h
create mode 100644 target/s390x/tcg-stub.c
create mode 100644 target/s390x/tcg_s390x.h