[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/24] m68k: cpu: add TARGET_DEFAULT_CPU_TYPE macro
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 05/24] m68k: cpu: add TARGET_DEFAULT_CPU_TYPE macro |
Date: |
Wed, 17 Jan 2018 16:43:17 +0100 |
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.
With the later in mind set it to 'any', which is current
default for M68K targets.
While at it, drop redundant ifdef in linux-user, as catch
all #else sets default to the same 'any' model.
Signed-off-by: Igor Mammedov <address@hidden>
---
CC: Riku Voipio <address@hidden>
CC: Laurent Vivier <address@hidden>
---
target/m68k/cpu.h | 1 +
linux-user/main.c | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 2985b03..193e8f8 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -405,6 +405,7 @@ void register_m68k_insns (CPUM68KState *env);
#define M68K_CPU_TYPE_SUFFIX "-" TYPE_M68K_CPU
#define M68K_CPU_TYPE_NAME(model) model M68K_CPU_TYPE_SUFFIX
+#define TARGET_DEFAULT_CPU_TYPE M68K_CPU_TYPE_NAME("any")
#define cpu_signal_handler cpu_m68k_signal_handler
#define cpu_list m68k_cpu_list
diff --git a/linux-user/main.c b/linux-user/main.c
index a35477e..54e8aac 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -4327,8 +4327,6 @@ int main(int argc, char **argv, char **envp)
#endif
#elif defined(TARGET_UNICORE32)
cpu_model = "any";
-#elif defined(TARGET_M68K)
- cpu_model = "any";
#elif defined(TARGET_SPARC)
#ifdef TARGET_SPARC64
cpu_model = "TI UltraSparc II";
--
2.7.4
- [Qemu-devel] [PATCH 00/24] generalize parsing of cpu_model (part 4), Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 02/24] alpha: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 04/24] lm32: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 05/24] m68k: cpu: add TARGET_DEFAULT_CPU_TYPE macro,
Igor Mammedov <=
- [Qemu-devel] [PATCH 10/24] openrisc: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 06/24] microblaze: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 09/24] nios2: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 08/24] moxie: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 07/24] mips: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 01/24] arm: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 03/24] cris: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 11/24] ppc: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17
- [Qemu-devel] [PATCH 12/24] s390x: cpu: add TARGET_DEFAULT_CPU_TYPE macro, Igor Mammedov, 2018/01/17