[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/38] sh4: r2d: use generic cpu_model parsing
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 17/38] sh4: r2d: use generic cpu_model parsing |
Date: |
Mon, 2 Oct 2017 11:07:59 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
---
CC: Magnus Damm <address@hidden>
CC: Aurelien Jarno <address@hidden>
---
hw/sh4/r2d.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 16b9ed2..458ed83 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -225,7 +225,6 @@ static struct QEMU_PACKED
static void r2d_init(MachineState *machine)
{
- const char *cpu_model = machine->cpu_model;
const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename;
@@ -242,11 +241,7 @@ static void r2d_init(MachineState *machine)
MemoryRegion *address_space_mem = get_system_memory();
PCIBus *pci_bus;
- if (cpu_model == NULL) {
- cpu_model = "SH7751R";
- }
-
- cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
+ cpu = SUPERH_CPU(cpu_create(machine->cpu_type));
env = &cpu->env;
reset_info = g_malloc0(sizeof(ResetData));
@@ -365,6 +360,7 @@ static void r2d_machine_init(MachineClass *mc)
mc->desc = "r2d-plus board";
mc->init = r2d_init;
mc->block_default_type = IF_IDE;
+ mc->default_cpu_type = TYPE_SH7751R_CPU;
}
DEFINE_MACHINE("r2d", r2d_machine_init)
--
2.7.4
- [Qemu-devel] [PATCH 10/38] m68k: an5206: use generic cpu_model parsing, (continued)
- [Qemu-devel] [PATCH 10/38] m68k: an5206: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 14/38] moxie: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 12/38] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite", Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 13/38] moxie: cleanup cpu type name composition, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 17/38] sh4: r2d: use generic cpu_model parsing,
Igor Mammedov <=
- [Qemu-devel] [PATCH 16/38] openrisc: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 18/38] sh4: shix: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 15/38] openrisc: cleanup cpu type name composition, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 20/38] sh4: simplify superh_cpu_class_by_name(), Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 19/38] sh4: cleanup cpu type name composition, Igor Mammedov, 2017/10/02