33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From 52f9cd6fd4943ff0202133646da31788447a2209 Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Hildenbrand <david@redhat.com>
|
||
|
|
Date: Mon, 30 Jan 2017 15:50:25 +0100
|
||
|
|
Subject: [PATCH] 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: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
linux-user/main.c | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
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
|