@@ -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 CPU_RESOLVING_TYPE TYPE_ARM_CPU
#define cpu_signal_handler cpu_arm_signal_handler
#define cpu_list arm_cpu_list
@@ -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)
@@ -24,6 +24,8 @@ struct arch2cpu {
static struct arch2cpu cpus_map[] = {
/* tested targets list */
+ { "arm", "cortex-a15" },
+ { "aarch64", "cortex-a57" },
};
static const char *get_cpu_model_by_arch(const char *arch)
it will be used for providing to cpu name resolving class for parsing cpu model for system and user emulation code. Along with change add target to null-machine test, so that when switch to CPU_RESOLVING_TYPE happens, thest would ensure that null-mchine usecase still works. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v2: - use cortex-a57 for aarch64 test (Andrew Jones <drjones@redhat.com>) CC: qemu-arm@nongnu.org CC: Peter Maydell <peter.maydell@linaro.org> CC: Andrew Jones <drjones@redhat.com> --- target/arm/cpu.h | 1 + linux-user/main.c | 2 -- tests/machine-none-test.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-)