diff options
Diffstat (limited to 'hw/alpha')
| -rw-r--r-- | hw/alpha/dp264.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 3b307ad873..1c5a177102 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -51,7 +51,7 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num) static void clipper_init(MachineState *machine) { ram_addr_t ram_size = machine->ram_size; - const char *cpu_model = machine->cpu_model; + const char *cpu_model = machine->cpu_model ? machine->cpu_model : "ev67"; const char *kernel_filename = machine->kernel_filename; const char *kernel_cmdline = machine->kernel_cmdline; const char *initrd_filename = machine->initrd_filename; @@ -67,7 +67,11 @@ static void clipper_init(MachineState *machine) /* Create up to 4 cpus. */ memset(cpus, 0, sizeof(cpus)); for (i = 0; i < smp_cpus; ++i) { - cpus[i] = cpu_alpha_init(cpu_model ? cpu_model : "ev67"); + cpus[i] = ALPHA_CPU(cpu_generic_init(TYPE_ALPHA_CPU, cpu_model)); + if (!cpus[i]) { + error_report("Unable to find CPU definition"); + exit(1); + } } cpus[0]->env.trap_arg0 = ram_size; |