openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apic creation should not depend on pci 

It should depend on whether cpu has APIC.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gleb Natapov 2009-06-08 15:59:46 +03:00 committed by Anthony Liguori
parent df97b92060
commit c4f31a0a0c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/pc.c
View File

@ -876,16 +876,10 @@ static void pc_init1(ram_addr_t ram_size,
fprintf(stderr, "Unable to find x86 CPU definition\n");
exit(1);
}
if (i != 0)
env->halted = 1;
if (smp_cpus > 1) {
/* XXX: enable it in all cases */
env->cpuid_features |= CPUID_APIC;
}
qemu_register_reset(main_cpu_reset, 0, env);
if (pci_enabled) {
if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) {
apic_init(env);
}
qemu_register_reset(main_cpu_reset, 0, env);
}
vmport_init();