[Qemu-devel] [PATCH 16/24] unicore32: cpu: add TARGET_DEFAULT_CPU_TYPE macro

[Igor Mammedov]

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 value from linux-user for TARGET_DEFAULT_CPU_TYPE.
While at it drop redundant ifdef and let catch all #else set
default to the same 'any' model.

Signed-off-by: Igor Mammedov <address@hidden>
---
CC: Riku Voipio <address@hidden>
CC: Laurent Vivier <address@hidden>
CC: Guan Xuetao <address@hidden>
---
 target/unicore32/cpu.h | 1 +
 linux-user/main.c      | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h
index 3dc6fbc..fd3fa81 100644
--- a/target/unicore32/cpu.h
+++ b/target/unicore32/cpu.h
@@ -169,6 +169,7 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, 
bool ifetch)
 
 #define UNICORE32_CPU_TYPE_SUFFIX "-" TYPE_UNICORE32_CPU
 #define UNICORE32_CPU_TYPE_NAME(model) model UNICORE32_CPU_TYPE_SUFFIX
+#define TARGET_DEFAULT_CPU_TYPE UNICORE32_CPU_TYPE_NAME("any")
 
 static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong 
*pc,
                                         target_ulong *cs_base, uint32_t *flags)
diff --git a/linux-user/main.c b/linux-user/main.c
index 279cd97..1cd5033 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -4325,8 +4325,6 @@ int main(int argc, char **argv, char **envp)
 #else
         cpu_model = "qemu32";
 #endif
-#elif defined(TARGET_UNICORE32)
-        cpu_model = "any";
 #elif defined(TARGET_SPARC)
 #ifdef TARGET_SPARC64
         cpu_model = "TI UltraSparc II";
-- 
2.7.4