OSDN Git Service

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141105' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Nov 2014 14:58:59 +0000 (14:58 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Nov 2014 14:58:59 +0000 (14:58 +0000)
commit7a8dda7e5d8035a10812bb9e852576c91de2dcdc
treebcb075fad19c0fa53a4921ee0a9d685d843eedba
parent2d9177588bde9881c6602284d1b0b08e4dfe361e
parentbb3e9e1fd7ab62b60780c66d68b2d7bfd8758e61
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141105' into staging

Several bugfixes for s390x:
- instruction decoding and sparse warning in kvm
- overlong input and hangs in the sclp consoles

# gpg: Signature made Wed 05 Nov 2014 15:42:14 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"

* remotes/cohuck/tags/s390x-20141105:
  s390x/sclpconsole: Avoid hanging SCLP ASCII console
  s390x/sclpconsole-lm: Fix hanging SCLP line mode console
  s390x/sclpconsole-lm: truncate input if line is too long
  s390x/kvm: Fix warning from sparse
  s390x/kvm: Fix opcode decoding for eb instruction handler

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