From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebpuF-00056d-M8 for qemu-devel@nongnu.org; Wed, 17 Jan 2018 10:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebpuE-0008Aa-Rc for qemu-devel@nongnu.org; Wed, 17 Jan 2018 10:45:39 -0500 From: Igor Mammedov Date: Wed, 17 Jan 2018 16:43:13 +0100 Message-Id: <1516203816-19374-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1516203816-19374-1-git-send-email-imammedo@redhat.com> References: <1516203816-19374-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 01/24] arm: cpu: add TARGET_DEFAULT_CPU_TYPE macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Riku Voipio , Peter Maydell , Andrew Jones , qemu-arm@nongnu.org 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 --- CC: Riku Voipio CC: Laurent Vivier CC: Peter Maydell CC: Andrew Jones CC: qemu-arm@nongnu.org --- 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 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 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) #else cpu_model = "qemu32"; #endif -#elif defined(TARGET_ARM) - cpu_model = "any"; #elif defined(TARGET_UNICORE32) cpu_model = "any"; #elif defined(TARGET_M68K) -- 2.7.4