[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 11/38] m68k: mcf5208: use generic cpu_model pars
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH 11/38] m68k: mcf5208: use generic cpu_model parsing |
Date: |
Tue, 3 Oct 2017 11:28:42 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 |
On 02.10.2017 11:07, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <address@hidden>
> ---
> CC: address@hidden
> CC: 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 b9dde75..cfac845 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -217,7 +217,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;
> @@ -229,10 +228,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. */
> @@ -321,6 +317,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)
>
Acked-by: Thomas Huth <address@hidden>
- Re: [Qemu-devel] [PATCH 04/38] cris: cleanup cpu type name composition, (continued)
- [Qemu-devel] [PATCH 06/38] lm32: cleanup cpu type name composition, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 03/38] alpha: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 05/38] cris: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 11/38] m68k: mcf5208: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 08/38] lm32: lm32_boards: use generic cpu_model parsing, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 09/38] m68k: cleanup cpu type name composition, Igor Mammedov, 2017/10/02
- [Qemu-devel] [PATCH 10/38] m68k: an5206: use generic cpu_model parsing, Igor Mammedov, 2017/10/02