Re: [Qemu-devel] [PATCH 10/23] ppc: 40p/prep: replace cpu_model with cpu_type

[David Gibson]

On Thu, Oct 05, 2017 at 06:24:37PM +0200, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <address@hidden>

Acked-by: David Gibson <address@hidden>

> ---
>  hw/ppc/prep.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 94138a4..6f8accc 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -517,11 +517,8 @@ static void ppc_prep_init(MachineState *machine)
>      linux_boot = (kernel_filename != NULL);
>  
>      /* init CPUs */
> -    if (machine->cpu_model == NULL)
> -        machine->cpu_model = "602";
>      for (i = 0; i < smp_cpus; i++) {
> -        cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,
> -                                           machine->cpu_model));
> +        cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
>          env = &cpu->env;
>  
>          if (env->flags & POWERPC_FLAG_RTC_CLK) {
> @@ -684,6 +681,7 @@ static void prep_machine_init(MachineClass *mc)
>      mc->block_default_type = IF_IDE;
>      mc->max_cpus = MAX_CPUS;
>      mc->default_boot_order = "cad";
> +    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("602");
>  }
>  
>  static int prep_set_cmos_checksum(DeviceState *dev, void *opaque)
> @@ -718,10 +716,7 @@ static void ibm_40p_init(MachineState *machine)
>      char boot_device;
>  
>      /* init CPU */
> -    if (!machine->cpu_model) {
> -        machine->cpu_model = "604";
> -    }
> -    cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, 
> machine->cpu_model));
> +    cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
>      env = &cpu->env;
>      if (PPC_INPUT(env) != PPC_FLAGS_INPUT_6xx) {
>          error_report("only 6xx bus is supported on this machine");
> @@ -894,6 +889,7 @@ static void ibm_40p_machine_init(MachineClass *mc)
>      mc->default_ram_size = 128 * M_BYTE;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("604");
>  }
>  
>  DEFINE_MACHINE("40p", ibm_40p_machine_init)

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature