diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-04-03 12:59:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-04-03 12:59:29 +0100 |
| commit | 64a3b4d53d344bd494bcf969ee89467b560c7ce0 (patch) | |
| tree | 6fc8f4031e84fe8e9014cd5df8849a21e6127d5d /softmmu | |
| parent | f2a8261110c32c4dccd84e774d8dd7a0524e00fb (diff) | |
| parent | 5c30ef937f522a65df78dd9f496483fe4fc44d5e (diff) | |
| download | qemu-64a3b4d53d344bd494bcf969ee89467b560c7ce0.zip qemu-64a3b4d53d344bd494bcf969ee89467b560c7ce0.tar.gz qemu-64a3b4d53d344bd494bcf969ee89467b560c7ce0.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200403' into staging
- fix cpu number reporting in the stsi 3.2.2 block for kvm
- fix migration for old machines with odd ram sizes
# gpg: Signature made Fri 03 Apr 2020 10:11:06 BST
# gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg: issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg: aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20200403:
vl/s390x: fixup ram sizes for compat machines
s390x: kvm: Fix number of cpu reports for stsi 3.2.2
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index 4f71ac1..58a40bc 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2600,6 +2600,9 @@ static bool set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size, } sz = QEMU_ALIGN_UP(sz, 8192); + if (mc->fixup_ram_size) { + sz = mc->fixup_ram_size(sz); + } ram_size = sz; if (ram_size != sz) { error_report("ram size too large"); |