[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/39] m68k: mcf5208: use generic cpu_model parsing
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 10/39] m68k: mcf5208: use generic cpu_model parsing |
Date: |
Thu, 26 Oct 2017 16:03:35 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Acked-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 68589c36d2..fac0d09cbc 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -218,7 +218,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;
@@ -230,10 +229,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. */
@@ -322,6 +318,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)
--
2.13.6
- [Qemu-devel] [PULL 00/39] x86/cpu/numa queue, 2017-10-26, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 01/39] alpha: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 02/39] alpha: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 04/39] cris: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 03/39] cris: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 06/39] lm32: milkymist: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 05/39] lm32: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 07/39] lm32: lm32_boards: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 08/39] m68k: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 09/39] m68k: an5206: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 10/39] m68k: mcf5208: use generic cpu_model parsing,
Eduardo Habkost <=
- [Qemu-devel] [PULL 11/39] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite", Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 12/39] moxie: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 13/39] moxie: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 15/39] openrisc: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 14/39] openrisc: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 17/39] sh4: shix: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 16/39] sh4: r2d: use generic cpu_model parsing, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 18/39] sh4: cleanup cpu type name composition, Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 19/39] sh4: simplify superh_cpu_class_by_name(), Eduardo Habkost, 2017/10/26
- [Qemu-devel] [PULL 20/39] sh4: remove SuperHCPUClass::name field, Eduardo Habkost, 2017/10/26