From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 2 Feb 2017 15:14:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170201' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b17d809b08e0315430d2e2923dbe4e967ef4f63;p=qemu.git

Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170201' into staging

s390x fixes

- build error with old gcc versions
- race between cmma reset and rom/loader resets
- linux-user vs. cpu model

# gpg: Signature made Wed 01 Feb 2017 08:24:47 GMT
# gpg:                using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20170201:
  target/s390x: use "qemu" cpu model in user mode
  s390x/kvm: fix small race reboot vs. cmma
  s390-pci: fix compilation on older GCC versions

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

0b17d809b08e0315430d2e2923dbe4e967ef4f63