[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-arm] [PATCH 01/24] arm: cpu: add TARGET_DEFAULT_CPU_TYPE macro

From: Igor Mammedov
Subject: [Qemu-arm] [PATCH 01/24] arm: cpu: add TARGET_DEFAULT_CPU_TYPE macro
Date: Wed, 17 Jan 2018 16:43:13 +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 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 <address@hidden>
CC: Riku Voipio <address@hidden>
CC: Laurent Vivier <address@hidden>
CC: Peter Maydell <address@hidden>
CC: Andrew Jones <address@hidden>
CC: address@hidden
 target/arm/cpu.h  | 1 +
 linux-user/main.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 9631670..c87bb76 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -2171,6 +2171,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, 
unsigned int excp_idx,
 #define cpu_signal_handler cpu_arm_signal_handler
 #define cpu_list arm_cpu_list
diff --git a/linux-user/main.c b/linux-user/main.c
index 450eb3c..a35477e 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -4325,8 +4325,6 @@ int main(int argc, char **argv, char **envp)
         cpu_model = "qemu32";
-#elif defined(TARGET_ARM)
-        cpu_model = "any";
 #elif defined(TARGET_UNICORE32)
         cpu_model = "any";
 #elif defined(TARGET_M68K)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]