]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140708' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 8 Jul 2014 14:10:42 +0000 (15:10 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 8 Jul 2014 14:10:42 +0000 (15:10 +0100)
commitd614cb68dacca24eb003825144d5a55d8f459a13
tree3e9992fa1cb16932c8f85195b22fe1e8a5569d0a
parent67d01fb8066b7bfa9be1b2c8537ad3f2406d98cf
parent2ed982b6a984cdf2940f426ee246f52492d4a415
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140708' into staging

Bugfixes for s390x: set subsystem id in the lowcore when booting from the
s390-ccw bios, and set the channel-program address after I/O completion,
when applicable.

# gpg: Signature made Tue 08 Jul 2014 14:18:20 BST using RSA key ID C6F02FAF
# gpg: Can't check signature: public key not found

* remotes/cohuck/tags/s390x-20140708:
  s390x/css: reflect cpa in scsw
  pc-bios/s390-ccw: update binary
  pc-bios/s390-ccw: store proper subsystem information word

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>