The following changes since commit b6011bd8a57c1eda81a857d21adeb9b66e58b1b0:
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20141006-2' into staging (2014-10-07 10:41:48 +0100) are available in the git repository at: git://github.com/cohuck/qemu.git tags/s390x-20141009 for you to fetch changes up to 2adf6bbb8ad7e53f602d10b2b30d22cd831f79a6: s390x/virtio-ccw: fix vhost-scsi intialization (2014-10-09 14:22:47 +0200) ---------------------------------------------------------------- various s390x updates: - cpu state handling in qemu and migration - vhost-scsi-ccw bugfix ---------------------------------------------------------------- Cornelia Huck (1): s390x/virtio-ccw: fix vhost-scsi intialization David Hildenbrand (5): s390x/kvm: introduce proper states for s390 cpus s390x/kvm: proper use of the cpu states OPERATING and STOPPED s390x/kvm: propagate s390 cpu state to kvm s390x/kvm: reuse kvm_s390_reset_vcpu() to get rid of ifdefs s390x/kvm: synchronize the cpu state after SIGP (INITIAL) CPU RESET Jens Freimann (1): linux-headers: update to 3.17-rc7 Thomas Huth (1): s390x/migration: migrate CPU state hw/s390x/ipl.c | 2 +- hw/s390x/s390-virtio.c | 32 ------- hw/s390x/virtio-ccw.c | 2 +- linux-headers/asm-mips/kvm_para.h | 6 +- linux-headers/asm-powerpc/kvm.h | 2 + linux-headers/asm-x86/kvm.h | 3 + linux-headers/linux/kvm.h | 13 ++- linux-headers/linux/kvm_para.h | 3 + linux-headers/linux/vfio.h | 34 ++++++++ linux-headers/linux/vhost.h | 2 +- target-s390x/cpu.c | 168 +++++++++++++++++++++++++++++++------ target-s390x/cpu.h | 41 +++++++-- target-s390x/helper.c | 19 ++--- target-s390x/kvm.c | 58 +++++++++++-- trace-events | 6 ++ 15 files changed, 299 insertions(+), 92 deletions(-) -- 1.7.9.5
