@@ -506,7 +506,7 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
#else
#define XTENSA_DEFAULT_CPU_MODEL "dc232b"
#endif
-#define XTENSA_DEFAULT_CPU_TYPE XTENSA_CPU_TYPE_NAME(XTENSA_DEFAULT_CPU_MODEL)
+#define TARGET_DEFAULT_CPU_TYPE XTENSA_CPU_TYPE_NAME(XTENSA_DEFAULT_CPU_MODEL)
#define cpu_init(cpu_model) cpu_generic_init(TYPE_XTENSA_CPU, cpu_model)
@@ -128,7 +128,7 @@ static void xtensa_sim_machine_init(MachineClass *mc)
mc->init = xtensa_sim_init;
mc->max_cpus = 4;
mc->no_serial = 1;
- mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
}
DEFINE_MACHINE("sim", xtensa_sim_machine_init)
@@ -449,7 +449,7 @@ static void xtensa_lx60_class_init(ObjectClass *oc, void *data)
mc->desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_lx60_init;
mc->max_cpus = 4;
- mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
}
static const TypeInfo xtensa_lx60_type = {
@@ -465,7 +465,7 @@ static void xtensa_lx200_class_init(ObjectClass *oc, void *data)
mc->desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_lx200_init;
mc->max_cpus = 4;
- mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
}
static const TypeInfo xtensa_lx200_type = {
@@ -481,7 +481,7 @@ static void xtensa_ml605_class_init(ObjectClass *oc, void *data)
mc->desc = "ml605 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_ml605_init;
mc->max_cpus = 4;
- mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
}
static const TypeInfo xtensa_ml605_type = {
@@ -497,7 +497,7 @@ static void xtensa_kc705_class_init(ObjectClass *oc, void *data)
mc->desc = "kc705 EVB (" XTENSA_DEFAULT_CPU_MODEL ")";
mc->init = xtensa_kc705_init;
mc->max_cpus = 4;
- mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
}
static const TypeInfo xtensa_kc705_type = {
so naming would be in line with other targets and null-machine.c which uses the later would compile. Later it also would be used as default for *-user targets which is currently bogus cpu model 'any', that errors out. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- CC: Max Filippov <jcmvbkbc@gmail.com> --- target/xtensa/cpu.h | 2 +- hw/xtensa/sim.c | 2 +- hw/xtensa/xtfpga.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)