| Message ID | 1507220690-265042-11-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | generalize parsing of cpu_model (part 3/PPC) | expand |
On Thu, Oct 05, 2017 at 06:24:37PM +0200, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > 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)
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)
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- hw/ppc/prep.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)