target-i386: Remove POPCNT from qemu64 and qemu32 CPU models

POPCNT is not available on Penryn and older and on Opteron_G2 and older,
and we want to make the default CPU runnable in most hosts, so it won't
be enabled by default in KVM mode.

We should eventually have all features supported by TCG enabled by
default in TCG mode, but as we don't have a good mechanism today to
ensure we have different defaults in KVM and TCG mode, disable POPCNT in
the qemu64 and qemu32 CPU models entirely.

Backports commit 6aa91e4a0237ddcebb85e3a95e166f3b3cfa42ae from qemu
This commit is contained in:
Eduardo Habkost 2018-02-17 15:33:25 -05:00 committed by Lioncash
parent 716da652e7
commit b558a66ba2
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7

View File

@ -677,7 +677,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
CPUID_PSE36, CPUID_PSE36,
// FEAT_1_ECX // FEAT_1_ECX
CPUID_EXT_SSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT, CPUID_EXT_SSE3 | CPUID_EXT_CX16,
// FEAT_7_0_EBX // FEAT_7_0_EBX
0, 0,
// FEAT_8000_0001_EDX // FEAT_8000_0001_EDX
@ -787,7 +787,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
// FEAT_1_EDX // FEAT_1_EDX
PPRO_FEATURES, PPRO_FEATURES,
// FEAT_1_ECX // FEAT_1_ECX
CPUID_EXT_SSE3 | CPUID_EXT_POPCNT, CPUID_EXT_SSE3,
}, },
}, },
{ {