diff options
| author | Stefan Weil <sw@weilnetz.de> | 2017-01-30 14:15:17 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-03-30 12:47:49 -0500 |
| commit | 877e2b016ebc4686322e5f08186eb25ed42a52a3 (patch) | |
| tree | 9fad688946678fede88c7de57e1a2851c6e0bc35 | |
| parent | 2f8ab9b1dd59d9c262ccca872ba476d23f6cf8ff (diff) | |
| download | qemu-877e2b016ebc4686322e5f08186eb25ed42a52a3.tar.gz | |
target/s390x: Fix broken user mode
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>
(cherry picked from commit a352aa62a75fcb1db35a0c71a10af3b2c1f8b89f)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | target-s390x/cpu_models.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c index c1e729df5e..1a0702c802 100644 --- a/target-s390x/cpu_models.c +++ b/target-s390x/cpu_models.c @@ -659,7 +659,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; @@ -679,7 +678,6 @@ static S390CPUModel *get_max_cpu_model(Error **errp) cached = true; return &max_model; } -#endif return NULL; } |