From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 31 Jul 2018 09:10:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180731' into staging
X-Git-Tag: v3.0.0-rc3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd76fef8e53e0f2876ef5f98e58b5c59fa1eb115;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180731' into staging

fix large guests on s390x

# gpg: Signature made Tue 31 Jul 2018 07:47:38 BST
# gpg:                using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20180731:
  s390x/sclp: fix maxram calculation

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

fd76fef8e53e0f2876ef5f98e58b5c59fa1eb115