[Qemu-devel] [PATCH 2/6] always have apic

[Glauber Costa <glommer@redhat.com>]

if we are going to initialize the apic, set cpuid bit unconditionally.
As far as I know, we should not do that for isa machines anyway.

Signed-off-by: Glauber Costa <glommer@redhat.com>
---
 hw/pc.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 39ed066..7649f2c 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -784,12 +784,10 @@ CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled)
     }
     if (cpu != 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, env);
     if (pci_enabled) {
+        env->cpuid_features |= CPUID_APIC;
         apic_init(env);
     }
     return env;
-- 
1.5.6.6