Revision c4f31a0a

b/hw/pc.c
876 876
            fprintf(stderr, "Unable to find x86 CPU definition\n");
877 877
            exit(1);
878 878
        }
879
        if (i != 0)
880
            env->halted = 1;
881
        if (smp_cpus > 1) {
882
            /* XXX: enable it in all cases */
883
            env->cpuid_features |= CPUID_APIC;
884
        }
885
        qemu_register_reset(main_cpu_reset, 0, env);
886
        if (pci_enabled) {
879
        if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
887 880
            apic_init(env);
888 881
        }
882
        qemu_register_reset(main_cpu_reset, 0, env);
889 883
    }
890 884

  
891 885
    vmport_init();

Also available in: Unified diff