aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2017-01-30 15:50:25 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-03-16 12:10:40 -0500
commit5e40f283e5a9cc2f39ae7a5bbb1ec122d346d50a (patch)
tree7ac50125aa946867495762fcf36f660c1944a2ea
parentd2b9063eb8f39fef8bce90c99a85008baa3bf1d6 (diff)
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 (cherry picked from commit d8923bc75479cd3fdcc72b7647f4877f91950b01) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-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 75b199f274..cc77ec4713 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -4045,6 +4045,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