summaryrefslogtreecommitdiffstats
path: root/linux-user
diff options
context:
space:
mode:
authorDavid Hildenbrand2017-01-30 15:50:25 +0100
committerChristian Borntraeger2017-02-01 09:15:17 +0100
commitd8923bc75479cd3fdcc72b7647f4877f91950b01 (patch)
tree9b55db5676dc4902e7b191fcfcbe2924dc782d57 /linux-user
parents390x/kvm: fix small race reboot vs. cmma (diff)
downloadqemu-d8923bc75479cd3fdcc72b7647f4877f91950b01.tar.gz
qemu-d8923bc75479cd3fdcc72b7647f4877f91950b01.tar.xz
qemu-d8923bc75479cd3fdcc72b7647f4877f91950b01.zip
target/s390x: use "qemu" cpu model in user mode
"any" does not exist, therefore resulting in a misleading error message. Reported-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20170130145025.26475-1-david@redhat.com> Reviewed-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Alexander Graf <agraf@suse.de> Cc: qemu-stable@nongnu.org
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 30049581ef..e588f58f2a 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -4322,6 +4322,8 @@ int main(int argc, char **argv, char **envp)
# endif
#elif defined TARGET_SH4
cpu_model = TYPE_SH7785_CPU;
+#elif defined TARGET_S390X
+ cpu_model = "qemu";
#else
cpu_model = "any";
#endif