[Qemu-devel] [PATCH 1/2] target-arm: Allow CPU "any" for system-mode emulation

[meadori]

From: Meador Inge <address@hidden>

The "any" CPU is useful for cases where the system-mode
emulator is being used to work with a wide array of
bare-metal C/C++ applications that have been compiled
in different ways.

Signed-off-by: Meador Inge <address@hidden>
---
 target-arm/cpu.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 80669a6..3665f6b 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -1243,7 +1243,6 @@ static void pxa270c5_initfn(Object *obj)
     cpu->reset_sctlr = 0x00000078;
 }
 
-#ifdef CONFIG_USER_ONLY
 static void arm_any_initfn(Object *obj)
 {
     ARMCPU *cpu = ARM_CPU(obj);
@@ -1258,7 +1257,6 @@ static void arm_any_initfn(Object *obj)
     set_feature(&cpu->env, ARM_FEATURE_CRC);
     cpu->midr = 0xffffffff;
 }
-#endif
 
 #endif /* !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) */
 
@@ -1305,10 +1303,8 @@ static const ARMCPUInfo arm_cpus[] = {
     { .name = "pxa270-b1",   .initfn = pxa270b1_initfn },
     { .name = "pxa270-c0",   .initfn = pxa270c0_initfn },
     { .name = "pxa270-c5",   .initfn = pxa270c5_initfn },
-#ifdef CONFIG_USER_ONLY
     { .name = "any",         .initfn = arm_any_initfn },
 #endif
-#endif
     { .name = NULL }
 };
 
-- 
1.8.1.1