enable APIC by default

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1854 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-i386/helper2.c b/target-i386/helper2.c
index 5195fa3d3d31aa83f9049cf48610348d0c639878..9d5d9b564e7be6859c493e4c92161009ed276a46 100644 (file)
--- a/target-i386/helper2.c
+++ b/target-i386/helper2.c
@@ -110,6 +110,7 @@ CPUX86State *cpu_x86_init(void)
         env->pat = 0x0007040600070406ULL;
         env->cpuid_ext_features = CPUID_EXT_SSE3;
         env->cpuid_features |= CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | CPUID_PAE | CPUID_SEP;
+        env->cpuid_features |= CPUID_APIC;
         env->cpuid_xlevel = 0;
         {
             const char *model_id = "QEMU Virtual CPU version " QEMU_VERSION;
@@ -125,7 +126,6 @@ CPUX86State *cpu_x86_init(void)
         }
 #ifdef TARGET_X86_64
         /* currently not enabled for std i386 because not fully tested */
-        env->cpuid_features |= CPUID_APIC;
         env->cpuid_ext2_features = (env->cpuid_features & 0x0183F3FF);
         env->cpuid_ext2_features |= CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX;
         env->cpuid_xlevel = 0x80000008;