[Qemu-devel] [PULL for-3.0 0/1] s390x fix for -rc3

[Qemu-devel] [PULL for-3.0 0/1] s390x fix for -rc3

[Cornelia Huck]

The following changes since commit 18a398f6a39df4b08ff86ac0d38384193ca5f4cc:

  Update version for v3.0.0-rc2 release (2018-07-24 22:06:31 +0100)

are available in the Git repository at:

  git://github.com/cohuck/qemu tags/s390x-20180731

for you to fetch changes up to 408e5ace517ff18c9c7cd918fc93358162e6e26d:

  s390x/sclp: fix maxram calculation (2018-07-30 17:41:52 +0200)

----------------------------------------------------------------
fix large guests on s390x

----------------------------------------------------------------

Christian Borntraeger (1):
  s390x/sclp: fix maxram calculation

 hw/s390x/sclp.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.14.4

[Qemu-devel] [PULL for-3.0 1/1] s390x/sclp: fix maxram calculation

[Cornelia Huck]

From: Christian Borntraeger <borntraeger@de.ibm.com>

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 <borntraeger@de.ibm.com>
CC: qemu-stable@nongnu.org
CC: David Hildenbrand <david@redhat.com>
Message-Id: <1532959766-53343-1-git-send-email-borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 hw/s390x/sclp.c | 1 +
 1 file changed, 1 insertion(+)

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;
 }
-- 
2.14.4

Re: [Qemu-devel] [PULL for-3.0 0/1] s390x fix for -rc3

[Peter Maydell]

On 31 July 2018 at 07:50, Cornelia Huck <cohuck@redhat.com> wrote:
> The following changes since commit 18a398f6a39df4b08ff86ac0d38384193ca5f4cc:
>
>   Update version for v3.0.0-rc2 release (2018-07-24 22:06:31 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/cohuck/qemu tags/s390x-20180731
>
> for you to fetch changes up to 408e5ace517ff18c9c7cd918fc93358162e6e26d:
>
>   s390x/sclp: fix maxram calculation (2018-07-30 17:41:52 +0200)
>
> ----------------------------------------------------------------
> fix large guests on s390x
>

Applied, thanks.

-- PMM