Revision 8ebdf9dc

b/hw/sun4u.c
754 754

  
755 755
static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef)
756 756
{
757
    SPARCCPU *cpu;
757 758
    CPUSPARCState *env;
758 759
    ResetData *reset_info;
759 760

  
......
761 762
    uint32_t  stick_frequency = 100*1000000;
762 763
    uint32_t hstick_frequency = 100*1000000;
763 764

  
764
    if (!cpu_model)
765
    if (cpu_model == NULL) {
765 766
        cpu_model = hwdef->default_cpu_model;
766
    env = cpu_init(cpu_model);
767
    if (!env) {
767
    }
768
    cpu = cpu_sparc_init(cpu_model);
769
    if (cpu == NULL) {
768 770
        fprintf(stderr, "Unable to find Sparc CPU definition\n");
769 771
        exit(1);
770 772
    }
773
    env = &cpu->env;
771 774

  
772 775
    env->tick = cpu_timer_create("tick", env, tick_irq,
773 776
                                  tick_frequency, TICK_NPT_MASK);

Also available in: Unified diff