From c4f31a0a0c1f44a5253f892fea4e711028021c66 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Mon, 8 Jun 2009 15:59:46 +0300 Subject: Apic creation should not depend on pci It should depend on whether cpu has APIC. Signed-off-by: Gleb Natapov Signed-off-by: Anthony Liguori --- hw/pc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'hw/pc.c') diff --git a/hw/pc.c b/hw/pc.c index aa9257679..dc284970e 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -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(); -- cgit v1.2.3