From: Peter Maydell Date: Fri, 10 Oct 2014 13:55:29 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141010' into staging X-Git-Tag: qemu-xen-4.6.0-rc1~135 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b1d28ec6a7dbdaadda39d29322f0de694aeb0b74;p=qemu-upstream-4.6-testing.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141010' into staging various s390x updates: - cpu state handling in qemu and migration - vhost-scsi-ccw bugfix # gpg: Signature made Fri 10 Oct 2014 14:01:34 BST using RSA key ID C6F02FAF # gpg: Can't check signature: public key not found * remotes/cohuck/tags/s390x-20141010: s390x/virtio-ccw: fix vhost-scsi intialization s390x/migration: migrate CPU state s390x/kvm: synchronize the cpu state after SIGP (INITIAL) CPU RESET s390x/kvm: reuse kvm_s390_reset_vcpu() to get rid of ifdefs s390x/kvm: propagate s390 cpu state to kvm s390x/kvm: proper use of the cpu states OPERATING and STOPPED s390x/kvm: introduce proper states for s390 cpus linux-headers: update to 3.17-rc7 Signed-off-by: Peter Maydell --- b1d28ec6a7dbdaadda39d29322f0de694aeb0b74