[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 05/23] ppc: mac_newworld: use generic cpu_model parsin
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [PATCH 05/23] ppc: mac_newworld: use generic cpu_model parsing |
Date: |
Thu, 5 Oct 2017 18:24:32 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/ppc/mac_newworld.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 6d0ace2..3fa7c42 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -174,16 +174,8 @@ static void ppc_core99_init(MachineState *machine)
linux_boot = (kernel_filename != NULL);
/* 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++) {
- cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,
- machine->cpu_model));
+ cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
env = &cpu->env;
/* 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->default_boot_order = "cd";
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 = {
--
2.7.4
- Re: [Qemu-ppc] [PATCH 02/23] qom: introduce type_register_static_array(), (continued)
[Qemu-ppc] [PATCH 05/23] ppc: mac_newworld: use generic cpu_model parsing,
Igor Mammedov <=
[Qemu-ppc] [PATCH 09/23] ppc: virtex-ml507: replace cpu_model with cpu_type, Igor Mammedov, 2017/10/05
[Qemu-ppc] [PATCH 06/23] ppc: mac_oldworld: use generic cpu_model parsing, Igor Mammedov, 2017/10/05
[Qemu-ppc] [PATCH 07/23] ppc: bamboo: use generic cpu_model parsing, Igor Mammedov, 2017/10/05
[Qemu-ppc] [PATCH 08/23] ppc: replace cpu_model with cpu_type on ref405ep, taihu boards, Igor Mammedov, 2017/10/05
[Qemu-ppc] [PATCH 11/23] ppc: spapr: replace ppc_cpu_parse_features() with cpu_parse_cpu_model(), Igor Mammedov, 2017/10/05