[Qemu-devel] [PULL for-2.9 0/1] another s390x bugfix

[Qemu-devel] [PULL for-2.9 0/1] another s390x bugfix

[Cornelia Huck]

The following changes since commit 55a19ad8b2d0797e3a8fe90ab99a9bb713824059:

  Update version for v2.9.0-rc1 release (2017-03-21 17:13:29 +0000)

are available in the git repository at:

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

for you to fetch changes up to a352aa62a75fcb1db35a0c71a10af3b2c1f8b89f:

  target/s390x: Fix broken user mode (2017-03-23 10:49:13 +0100)

----------------------------------------------------------------
Fix linux-user vs. cpu models.

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

Stefan Weil (1):
  target/s390x: Fix broken user mode

 target/s390x/cpu_models.c | 2 --
 1 file changed, 2 deletions(-)

-- 
2.11.0

[Qemu-devel] [PULL for-2.9 1/1] target/s390x: Fix broken user mode

[Cornelia Huck]

From: Stefan Weil <sw@weilnetz.de>

Returning NULL from get_max_cpu_model results in a SIGSEGV runtime error.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170130131517.8092-1-sw@weilnetz.de>
Cc: qemu-stable@nongnu.org
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 target/s390x/cpu_models.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 4ea3a2de80..1434d15315 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -660,7 +660,6 @@ static void check_compatibility(const S390CPUModel *max_model,
 
 static S390CPUModel *get_max_cpu_model(Error **errp)
 {
-#ifndef CONFIG_USER_ONLY
     static S390CPUModel max_model;
     static bool cached;
 
@@ -680,7 +679,6 @@ static S390CPUModel *get_max_cpu_model(Error **errp)
         cached = true;
         return &max_model;
     }
-#endif
     return NULL;
 }
 
-- 
2.11.0

Re: [Qemu-devel] [PULL for-2.9 0/1] another s390x bugfix

[Peter Maydell]

On 23 March 2017 at 09:59, Cornelia Huck <cornelia.huck@de.ibm.com> wrote:
> The following changes since commit 55a19ad8b2d0797e3a8fe90ab99a9bb713824059:
>
>   Update version for v2.9.0-rc1 release (2017-03-21 17:13:29 +0000)
>
> are available in the git repository at:
>
>   git://github.com/cohuck/qemu tags/s390x-20170323
>
> for you to fetch changes up to a352aa62a75fcb1db35a0c71a10af3b2c1f8b89f:
>
>   target/s390x: Fix broken user mode (2017-03-23 10:49:13 +0100)
>
> ----------------------------------------------------------------
> Fix linux-user vs. cpu models.
>
> ----------------------------------------------------------------
>
> Stefan Weil (1):
>   target/s390x: Fix broken user mode
>
>  target/s390x/cpu_models.c | 2 --
>  1 file changed, 2 deletions(-)

Applied, thanks.

-- PMM