From: David Hildenbrand <david@redhat.com>
Date: Mon, 30 Jan 2017 14:50:25 +0000 (+0100)
Subject: target/s390x: use "qemu" cpu model in user mode
X-Git-Tag: v2.9.0-rc0~117^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8923bc75479cd3fdcc72b7647f4877f91950b01;p=thirdparty%2Fqemu.git

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
---

diff --git a/linux-user/main.c b/linux-user/main.c
index 30049581ef8..e588f58f2ab 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