mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh4: r2d: use generic cpu_model parsing

Browse Source 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1507211474-188400-20-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-10-05 15:50:53 +02:00 committed by Eduardo Habkost
parent 1498e9706a
commit 78f60b829a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/sh4/r2d.c
View File

@ -225,7 +225,6 @@ static struct QEMU_PACKED
static void r2d_init(MachineState *machine) static void r2d_init(MachineState *machine)
{ {
const char *cpu_model = machine->cpu_model;
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline; const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename; const char *initrd_filename = machine->initrd_filename;
@ -242,11 +241,7 @@ static void r2d_init(MachineState *machine)
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
PCIBus *pci_bus; PCIBus *pci_bus;
if (cpu_model == NULL) { cpu = SUPERH_CPU(cpu_create(machine->cpu_type));
cpu_model = "SH7751R";
}
cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
env = &cpu->env; env = &cpu->env;
reset_info = g_malloc0(sizeof(ResetData)); reset_info = g_malloc0(sizeof(ResetData));
@ -365,6 +360,7 @@ static void r2d_machine_init(MachineClass *mc)
mc->desc = "r2d-plus board"; mc->desc = "r2d-plus board";
mc->init = r2d_init; mc->init = r2d_init;
mc->block_default_type = IF_IDE; mc->block_default_type = IF_IDE;
mc->default_cpu_type = TYPE_SH7751R_CPU;
} }
DEFINE_MACHINE("r2d", r2d_machine_init) DEFINE_MACHINE("r2d", r2d_machine_init)