| Message ID | 1378213995-12945-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
Am 03.09.2013 15:13, schrieb Peter Maydell: > Make the 'any' CPU for target-arm available only in linux-user mode. > The ARM target provides a CPU named "any", which turns on support for > all user-level instruction set extensions we know about. This is > intended for linux-user emulation mode, where it is the default CPU type. > It makes no sense to try to use this for system emulation, since we don't > initialize it with any system-level information like feature register > values or implementation specific cp15 registers. (Unsurprisingly, some > boards won't boot at all, though you might get lucky in some cases where > the guest doesn't happen to prod things that aren't there.) > > Prevent users from making this command line error by removing the > CPU definition from the softmmu build. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Andreas Färber <afaerber@suse.de> Andreas
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index b2556c6..827e28e 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -822,6 +822,7 @@ 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); @@ -834,6 +835,7 @@ static void arm_any_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7MP); cpu->midr = 0xffffffff; } +#endif typedef struct ARMCPUInfo { const char *name; @@ -874,7 +876,9 @@ 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 }; static void arm_cpu_class_init(ObjectClass *oc, void *data)
Make the 'any' CPU for target-arm available only in linux-user mode. The ARM target provides a CPU named "any", which turns on support for all user-level instruction set extensions we know about. This is intended for linux-user emulation mode, where it is the default CPU type. It makes no sense to try to use this for system emulation, since we don't initialize it with any system-level information like feature register values or implementation specific cp15 registers. (Unsurprisingly, some boards won't boot at all, though you might get lucky in some cases where the guest doesn't happen to prod things that aren't there.) Prevent users from making this command line error by removing the CPU definition from the softmmu build. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- As well as cutting off a user error, this conveniently avoids what would otherwise be a clash between an aarch64 'cpu any' and the 32 bit version. target-arm/cpu.c | 4 ++++ 1 file changed, 4 insertions(+)