diff options
| author | Peter Maydell | 2018-07-31 11:10:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-31 11:10:14 +0200 |
| commit | fd76fef8e53e0f2876ef5f98e58b5c59fa1eb115 (patch) | |
| tree | 487d2e9156dba049ad916ff72f42f2dd31e0eac0 | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | s390x/sclp: fix maxram calculation (diff) | |
| download | qemu-fd76fef8e53e0f2876ef5f98e58b5c59fa1eb115.tar.gz qemu-fd76fef8e53e0f2876ef5f98e58b5c59fa1eb115.tar.xz qemu-fd76fef8e53e0f2876ef5f98e58b5c59fa1eb115.zip | |
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>
| -rw-r--r-- | hw/s390x/sclp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index bd2a024efd..4510a800cb 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -320,6 +320,7 @@ static void sclp_memory_init(SCLPDevice *sclp) initial_mem = initial_mem >> increment_size << increment_size; machine->ram_size = initial_mem; + machine->maxram_size = initial_mem; /* let's propagate the changed ram size into the global variable. */ ram_size = initial_mem; } |