it will be used for for 2 purposes, 1st is to
provide to cpu name resolving class for machine 'none'
cpu_parse_cpu_model(machine_class->default_cpu_type, cpu_model)
and later to drop a bunch of ifdefs *-user/main.c that
set default cpu_model.
Use default values from linux-user for TARGET_DEFAULT_CPU_TYPE.
While at it fixup linux-user to use corresponding cpu models
instead of aliases.
Signed-off-by: Igor Mammedov <imamm...@redhat.com>
---
CC: Riku Voipio <riku.voi...@iki.fi>
CC: Laurent Vivier <laur...@vivier.eu>
CC: David Gibson <da...@gibson.dropbear.id.au>
CC: Alexander Graf <ag...@suse.de>
CC: qemu-...@nongnu.org
---
target/ppc/cpu.h | 6 ++++++
linux-user/main.c | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index a5e49f2..4af4aff 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1377,6 +1377,12 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn,
uint32_t val);
#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU
#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX
+#ifdef TARGET_PPC64
+#define TARGET_DEFAULT_CPU_TYPE POWERPC_CPU_TYPE_NAME("power8_v2.0")
+#else
+#define TARGET_DEFAULT_CPU_TYPE POWERPC_CPU_TYPE_NAME("750_v3.1")
+#endif
+
#define cpu_signal_handler cpu_ppc_signal_handler
#define cpu_list ppc_cpu_list
diff --git a/linux-user/main.c b/linux-user/main.c
index 54e8aac..279cd97 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -4343,9 +4343,9 @@ int main(int argc, char **argv, char **envp)
cpu_model = "or1200";
#elif defined(TARGET_PPC)
# ifdef TARGET_PPC64
- cpu_model = "POWER8";
+ cpu_model = "power8_v2.0";
# else
- cpu_model = "750";
+ cpu_model = "750_v3.1";
# endif
#elif defined TARGET_SH4
cpu_model = "sh7785";
--
2.7.4
