diff mbox series

[PULL,v2,09/39] m68k: an5206: use generic cpu_model parsing

Message ID	20171027142107.15542-10-ehabkost@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B5E7C7E426 From: Eduardo Habkost <ehabkost@redhat.com> To: Peter Maydell <peter.maydell@linaro.org> Date: Fri, 27 Oct 2017 16:20:37 +0200 Message-Id: <20171027142107.15542-10-ehabkost@redhat.com> In-Reply-To: <20171027142107.15542-1-ehabkost@redhat.com> References: <20171027142107.15542-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 09/39] m68k: an5206: use generic cpu_model parsing Precedence: list Cc: Igor Mammedov <imammedo@redhat.com>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,v2,01/39] alpha: cleanup cpu type name composition \| expand [PULL,v2,01/39] alpha: cleanup cpu type name composition [PULL,v2,02/39] alpha: use generic cpu_model parsing [PULL,v2,03/39] cris: cleanup cpu type name composition [PULL,v2,04/39] cris: use generic cpu_model parsing [PULL,v2,05/39] lm32: cleanup cpu type name composition [PULL,v2,06/39] lm32: milkymist: use generic cpu_model parsing [PULL,v2,07/39] lm32: lm32_boards: use generic cpu_model parsing [PULL,v2,08/39] m68k: cleanup cpu type name composition [PULL,v2,09/39] m68k: an5206: use generic cpu_model parsing [PULL,v2,10/39] m68k: mcf5208: use generic cpu_model parsing [PULL,v2,11/39] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite" [PULL,v2,12/39] moxie: cleanup cpu type name composition [PULL,v2,13/39] moxie: use generic cpu_model parsing [PULL,v2,14/39] openrisc: cleanup cpu type name composition [PULL,v2,15/39] openrisc: use generic cpu_model parsing [PULL,v2,16/39] sh4: r2d: use generic cpu_model parsing [PULL,v2,17/39] sh4: shix: use generic cpu_model parsing [PULL,v2,18/39] sh4: cleanup cpu type name composition [PULL,v2,19/39] sh4: simplify superh_cpu_class_by_name() [PULL,v2,20/39] sh4: remove SuperHCPUClass::name field [PULL,v2,21/39] xtensa: cleanup cpu type name composition [PULL,v2,22/39] xtensa: sim: use generic cpu_model parsing [PULL,v2,23/39] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing [PULL,v2,24/39] unicore32: cleanup cpu type name composition [PULL,v2,25/39] unicore32: use generic cpu_model parsing [PULL,v2,26/39] tricore: cleanup cpu type name composition [PULL,v2,27/39] tricore: use generic cpu_model parsing [PULL,v2,28/39] sparc: cleanup cpu type name composition [PULL,v2,29/39] sparc: sun4u/sun4v/niagara: use generic cpu_model parsing [PULL,v2,30/39] sparc: sparc: use generic cpu_model parsing [PULL,v2,31/39] sparc: leon3: use generic cpu_model parsing [PULL,v2,32/39] mips: use object_new() instead of gnew()+object_initialize() [PULL,v2,33/39] mips: malta/boston: replace cpu_model with cpu_type [PULL,v2,34/39] mips: fulong2e: replace cpu_model with cpu_type [PULL,v2,35/39] mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type [PULL,v2,36/39] mips: mipssim: replace cpu_model with cpu_type [PULL,v2,37/39] mips: r4k: replace cpu_model with cpu_type [PULL,v2,38/39] numa: fixup parsed NumaNodeOptions earlier [PULL,v2,39/39] x86: Skip check apic_id_limit for Xen

Commit Message

Eduardo Habkost Oct. 27, 2017, 2:20 p.m. UTC

From: Igor Mammedov <imammedo@redhat.com>

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Thomas Huth <huth@tuxfamily.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <1507211474-188400-13-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/m68k/an5206.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index db634cbe89..5e067ea1c3 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -28,7 +28,6 @@ 
 static void an5206_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;
@@ -39,10 +38,7 @@  static void an5206_init(MachineState *machine)
     MemoryRegion *ram = g_new(MemoryRegion, 1);
     MemoryRegion *sram = g_new(MemoryRegion, 1);
 
-    if (!cpu_model) {
-        cpu_model = "m5206";
-    }
-    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.  */
@@ -94,6 +90,7 @@  static void an5206_machine_init(MachineClass *mc)
 {
     mc->desc = "Arnewsh 5206";
     mc->init = an5206_init;
+    mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5206");
 }
 
 DEFINE_MACHINE("an5206", an5206_machine_init)