From 619064cd5e5f275a0d61fcd05855b1598c2d654b Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Wed, 1 Aug 2018 11:09:14 +0200 Subject: [PATCH 267/268] s390x/sclp: fix maxram calculation RH-Author: Cornelia Huck Message-id: <20180801110914.17729-1-cohuck@redhat.com> Patchwork-id: 81564 O-Subject: [RHEL-7.6 qemu-kvm-ma PATCH] s390x/sclp: fix maxram calculation Bugzilla: 1595740 RH-Acked-by: David Hildenbrand RH-Acked-by: Thomas Huth RH-Acked-by: Miroslav Rezanina From: Christian Borntraeger We clamp down ram_size to match the sclp increment size. We do not do the same for maxram_size, which means for large guests with some sizes (e.g. -m 50000) maxram_size differs from ram_size. This can break other code (e.g. CMMA migration) which uses maxram_size to calculate the number of pages and then throws some errors. Fixes: 82fab5c5b90e468f3e9d54c ("s390x/sclp: remove memory hotplug support") Signed-off-by: Christian Borntraeger CC: qemu-stable@nongnu.org CC: David Hildenbrand Message-Id: <1532959766-53343-1-git-send-email-borntraeger@de.ibm.com> Reviewed-by: David Hildenbrand Signed-off-by: Cornelia Huck (cherry picked from commit 408e5ace517ff18c9c7cd918fc93358162e6e26d) Signed-off-by: Cornelia Huck Signed-off-by: Miroslav Rezanina --- hw/s390x/sclp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 047d577..2abdb62 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -319,6 +319,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; } -- 1.8.3.1