diff mbox series

[v2,12/40] m68k: an5206: use generic cpu_model parsing

Message ID	1507211474-188400-13-git-send-email-imammedo@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 D1EE13D948 From: Igor Mammedov <imammedo@redhat.com> To: qemu-devel@nongnu.org Date: Thu, 5 Oct 2017 15:50:46 +0200 Message-Id: <1507211474-188400-13-git-send-email-imammedo@redhat.com> In-Reply-To: <1507211474-188400-1-git-send-email-imammedo@redhat.com> References: <1507211474-188400-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 12/40] m68k: an5206: use generic cpu_model parsing Precedence: list Cc: huth@tuxfamily.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>, laurent@vivier.eu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	generalize parsing of cpu_model (part 2) \| expand [v2,00/40] generalize parsing of cpu_model (part 2) [v2,01/40] qom: update doc comment for type_register[_static]() [v2,02/40] qom: introduce type_register_static_array() [v2,03/40] qom: add helper macro DEFINE_TYPES() [v2,04/40] alpha: cleanup cpu type name composition [v2,05/40] alpha: use generic cpu_model parsing [v2,06/40] cris: cleanup cpu type name composition [v2,07/40] cris: use generic cpu_model parsing [v2,08/40] lm32: cleanup cpu type name composition [v2,09/40] lm32: milkymist: use generic cpu_model parsing [v2,10/40] lm32: lm32_boards: use generic cpu_model parsing [v2,11/40] m68k: cleanup cpu type name composition [v2,12/40] m68k: an5206: use generic cpu_model parsing [v2,13/40] m68k: mcf5208: use generic cpu_model parsing [v2,14/40] moxie: fix qemu-system-moxie failing to start with CLI "-cpu MoxieLite" [v2,15/40] moxie: cleanup cpu type name composition [v2,16/40] moxie: use generic cpu_model parsing [v2,17/40] openrisc: cleanup cpu type name composition [v2,18/40] openrisc: use generic cpu_model parsing [v2,19/40] sh4: r2d: use generic cpu_model parsing [v2,20/40] sh4: shix: use generic cpu_model parsing [v2,21/40] sh4: cleanup cpu type name composition [v2,22/40] sh4: simplify superh_cpu_class_by_name() [v2,23/40] sh4: remove SuperHCPUClass::name field [v2,24/40] xtensa: cleanup cpu type name composition [v2,25/40] xtensa: sim: use generic cpu_model parsing [v2,26/40] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing [v2,27/40] unicore32: cleanup cpu type name composition [v2,28/40] unicore32: use generic cpu_model parsing [v2,29/40] tricore: cleanup cpu type name composition [v2,30/40] tricore: use generic cpu_model parsing [v2,31/40] sparc: cleanup cpu type name composition [v2,32/40] sparc: sun4u/sun4v/niagara: use generic cpu_model parsing [v2,33/40] sparc: sparc: use generic cpu_model parsing [v2,34/40] sparc: leon3: use generic cpu_model parsing [v2,35/40] mips: use object_new() instead of gnew()+object_initialize() [v2,36/40] mips: malta/boston: replace cpu_model with cpu_type [v2,37/40] mips: fulong2e: replace cpu_model with cpu_type [v2,38/40] mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type [v2,39/40] mips: mipssim: replace cpu_model with cpu_type [v2,40/40] mips: r4k: replace cpu_model with cpu_type

Commit Message

Igor Mammedov Oct. 5, 2017, 1:50 p.m. UTC

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>
---
CC: huth@tuxfamily.org
CC: laurent@vivier.eu
---
 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 9002c46..0cedc54 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)