Re: [Qemu-devel] [PATCH 14/38] moxie: use generic cpu_model parsing

[Philippe Mathieu-Daudé]

On 10/02/2017 06:07 AM, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
> CC: address@hidden
> ---
>   hw/moxie/moxiesim.c | 7 ++-----
>   1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
> index 01b9f34..3ba5848 100644
> --- a/hw/moxie/moxiesim.c
> +++ b/hw/moxie/moxiesim.c
> @@ -103,7 +103,6 @@ static void moxiesim_init(MachineState *machine)
>   {
>       MoxieCPU *cpu = NULL;
>       ram_addr_t ram_size = machine->ram_size;
> -    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;
> @@ -115,10 +114,7 @@ static void moxiesim_init(MachineState *machine)
>       LoaderParams loader_params;
>   
>       /* Init CPUs. */
> -    if (cpu_model == NULL) {
> -        cpu_model = "MoxieLite";
> -    }
> -    cpu = MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));
> +    cpu = MOXIE_CPU(cpu_create(machine->cpu_type));
>       env = &cpu->env;
>   
>       qemu_register_reset(main_cpu_reset, cpu);
> @@ -150,6 +146,7 @@ static void moxiesim_machine_init(MachineClass *mc)
>       mc->desc = "Moxie simulator platform";
>       mc->init = moxiesim_init;
>       mc->is_default = 1;
> +    mc->default_cpu_type = MOXIE_CPU_TYPE_NAME("MoxieLite");
>   }
>   
>   DEFINE_MACHINE("moxiesim", moxiesim_machine_init)