@@ -2171,6 +2171,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
#define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU
#define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX)
+#define TARGET_DEFAULT_CPU_TYPE ARM_CPU_TYPE_NAME("any")
#define cpu_signal_handler cpu_arm_signal_handler
#define cpu_list arm_cpu_list
@@ -4325,8 +4325,6 @@ int main(int argc, char **argv, char **envp)
#else
cpu_model = "qemu32";
#endif
-#elif defined(TARGET_ARM)
- cpu_model = "any";
#elif defined(TARGET_UNICORE32)
cpu_model = "any";
#elif defined(TARGET_M68K)
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 replace a bunch of ifdefs *-user/main.c that set default cpu_model with cpu type. With the later in mind set it to 'any', which is current default for ARM targets. While at it, default cpu_model for ARM is set to 'any' under TARGET_ARM, however there is catch all ifdef which also sets cpu_model to 'any'. Drop unnecessary TARGET_ARM ifdef and use catch all #else to set default value. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- CC: Riku Voipio <riku.voipio@iki.fi> CC: Laurent Vivier <laurent@vivier.eu> CC: Peter Maydell <peter.maydell@linaro.org> CC: Andrew Jones <drjones@redhat.com> CC: qemu-arm@nongnu.org --- target/arm/cpu.h | 1 + linux-user/main.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)