]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20140923' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 23 Sep 2014 12:28:06 +0000 (13:28 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 23 Sep 2014 12:28:06 +0000 (13:28 +0100)
commitcad684c5386ea01cd725418ff678d54af74068c3
tree8af6051b9e8d8fa77ecd5e76e5bc393384137d1f
parent380f649e02f9545159dc3158d7c1b2e70c1005e3
parente8601dd5d0ffa909068ddefe33bf6a53d8af063a
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20140923' into staging

s390x/kvm: some fixes and cleanups

1. sclp: get of of duplicate defines
2. ccw: implement and fix handling of some special cases

# gpg: Signature made Tue 23 Sep 2014 13:10:47 BST using RSA key ID B5A61C7C
# gpg: Can't check signature: public key not found

* remotes/borntraeger/tags/s390x-20140923:
  s390x/css: catch ccw sequence errors
  s390x/css: support format-0 ccws
  s390x: remove duplicate defines in SCLP code

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