gwj / at91sam9263 · Commits

Commit 96b74a0221a7d552a4b3016af2b8bc87628fdab3

Authored by bellard
1 parent c2ff060f

enable APIC by default 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1854 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
target-i386/helper2.c
  View file @96b74a0
@@ -110,6 +110,7 @@ CPUX86State *cpu_x86_init(void) @@ -110,6 +110,7 @@ CPUX86State *cpu_x86_init(void)
110 env->pat = 0x0007040600070406ULL; 110 env->pat = 0x0007040600070406ULL;
111 env->cpuid_ext_features = CPUID_EXT_SSE3; 111 env->cpuid_ext_features = CPUID_EXT_SSE3;
112 env->cpuid_features |= CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | CPUID_PAE | CPUID_SEP; 112 env->cpuid_features |= CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | CPUID_PAE | CPUID_SEP;
  113 + env->cpuid_features |= CPUID_APIC;
113 env->cpuid_xlevel = 0; 114 env->cpuid_xlevel = 0;
114 { 115 {
115 const char *model_id = "QEMU Virtual CPU version " QEMU_VERSION; 116 const char *model_id = "QEMU Virtual CPU version " QEMU_VERSION;
@@ -125,7 +126,6 @@ CPUX86State *cpu_x86_init(void) @@ -125,7 +126,6 @@ CPUX86State *cpu_x86_init(void)
125 } 126 }
126 #ifdef TARGET_X86_64 127 #ifdef TARGET_X86_64
127 /* currently not enabled for std i386 because not fully tested */ 128 /* currently not enabled for std i386 because not fully tested */
128 - env->cpuid_features |= CPUID_APIC;  
129 env->cpuid_ext2_features = (env->cpuid_features & 0x0183F3FF); 129 env->cpuid_ext2_features = (env->cpuid_features & 0x0183F3FF);
130 env->cpuid_ext2_features |= CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX; 130 env->cpuid_ext2_features |= CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX;
131 env->cpuid_xlevel = 0x80000008; 131 env->cpuid_xlevel = 0x80000008;