On 10/02/2017 06:07 AM, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > CC: laur...@vivier.eu > CC: h...@tuxfamily.org > --- > hw/m68k/mcf5208.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c > index b9dde75..cfac845 100644 > --- a/hw/m68k/mcf5208.c > +++ b/hw/m68k/mcf5208.c > @@ -217,7 +217,6 @@ static void mcf_fec_init(MemoryRegion *sysmem, NICInfo > *nd, hwaddr base, > static void mcf5208evb_init(MachineState *machine) > { > ram_addr_t ram_size = machine->ram_size; > - const char *cpu_model = machine->cpu_model; > const char *kernel_filename = machine->kernel_filename; > M68kCPU *cpu; > CPUM68KState *env; > @@ -229,10 +228,7 @@ static void mcf5208evb_init(MachineState *machine) > MemoryRegion *ram = g_new(MemoryRegion, 1); > MemoryRegion *sram = g_new(MemoryRegion, 1); > > - if (!cpu_model) { > - cpu_model = "m5208"; > - } > - cpu = M68K_CPU(cpu_generic_init(TYPE_M68K_CPU, cpu_model)); > + cpu = M68K_CPU(cpu_create(machine->cpu_type)); > env = &cpu->env; > > /* Initialize CPU registers. */ > @@ -321,6 +317,7 @@ static void mcf5208evb_machine_init(MachineClass *mc) > mc->desc = "MCF5206EVB"; > mc->init = mcf5208evb_init; > mc->is_default = 1; > + mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5208"); > } > > DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init) >