diff options
| author | Stefan Weil <sw@weilnetz.de> | 2017-01-30 14:15:17 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2017-03-23 10:49:13 +0100 |
| commit | a352aa62a75fcb1db35a0c71a10af3b2c1f8b89f (patch) | |
| tree | 8fd5d67fffdd56e7c4079c4255190a21f0e3d781 | |
| parent | 55a19ad8b2d0797e3a8fe90ab99a9bb713824059 (diff) | |
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>
| -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 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; } |