From a352aa62a75fcb1db35a0c71a10af3b2c1f8b89f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 30 Jan 2017 14:15:17 +0100 Subject: target/s390x: Fix broken user mode Returning NULL from get_max_cpu_model results in a SIGSEGV runtime error. Signed-off-by: Stefan Weil Reviewed-by: David Hildenbrand Message-Id: <20170130131517.8092-1-sw@weilnetz.de> Cc: qemu-stable@nongnu.org Signed-off-by: Christian Borntraeger Signed-off-by: Cornelia Huck --- target/s390x/cpu_models.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'target') 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; } -- cgit v1.2.1