ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc: mac_newworld: use generic cpu_model parsing 

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Igor Mammedov 2017-10-09 21:50:52 +02:00 committed by David Gibson
parent 59e816fd3e
commit 9dff4c07e1
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/ppc/mac_newworld.c
View File

@ -174,16 +174,8 @@ static void ppc_core99_init(MachineState *machine)
linux_boot = (kernel_filename != NULL); linux_boot = (kernel_filename != NULL);
/* init CPUs */ /* init CPUs */
if (machine->cpu_model == NULL) {
#ifdef TARGET_PPC64
machine->cpu_model = "970fx";
#else
machine->cpu_model = "G4";
#endif
}
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
machine->cpu_model));
env = &cpu->env; env = &cpu->env;
/* Set time-base frequency to 100 Mhz */ /* Set time-base frequency to 100 Mhz */
@ -520,6 +512,11 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
mc->max_cpus = MAX_CPUS; mc->max_cpus = MAX_CPUS;
mc->default_boot_order = "cd"; mc->default_boot_order = "cd";
mc->kvm_type = core99_kvm_type; mc->kvm_type = core99_kvm_type;
#ifdef TARGET_PPC64
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("970fx_v3.1");
#else
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");
#endif
} }
static const TypeInfo core99_machine_info = { static const TypeInfo core99_machine_info = {