The qemu64 and qemu32 CPU models won't be Pentium Pro supersets anymore because the DE feature will be removed. Copy PPRO_FEATURES into their definitions so we can change the CPU models later.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- target-i386/cpu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 32fee00..d505743 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -701,7 +701,10 @@ static X86CPUDefinition builtin_x86_defs[] = { .model = 6, .stepping = 3, .features[FEAT_1_EDX] = - PPRO_FEATURES | + CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC | + CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | + CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | + CPUID_PAE | CPUID_SEP | CPUID_APIC | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_PSE36, .features[FEAT_1_ECX] = @@ -804,7 +807,10 @@ static X86CPUDefinition builtin_x86_defs[] = { .model = 6, .stepping = 3, .features[FEAT_1_EDX] = - PPRO_FEATURES, + CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC | + CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | + CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | + CPUID_PAE | CPUID_SEP | CPUID_APIC, .features[FEAT_1_ECX] = CPUID_EXT_SSE3 | CPUID_EXT_POPCNT, .xlevel = 0x80000004, -- 2.1.0