Commit 6aa91e4a authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

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.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 71195672
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -337,6 +337,16 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
            .driver   = "qemu64" "-" TYPE_X86_CPU,\
            .property = "abm",\
            .value    = "on",\
        },\
        {\
            .driver   = "qemu64" "-" TYPE_X86_CPU,\
            .property = "popcnt",\
            .value    = "on",\
        },\
        {\
            .driver   = "qemu32" "-" TYPE_X86_CPU,\
            .property = "popcnt",\
            .value    = "on",\
        },

#define PC_COMPAT_2_3 \
+2 −2
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
            CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
            CPUID_PSE36,
        .features[FEAT_1_ECX] =
            CPUID_EXT_SSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT,
            CPUID_EXT_SSE3 | CPUID_EXT_CX16,
        .features[FEAT_8000_0001_EDX] =
            CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
        .features[FEAT_8000_0001_ECX] =
@@ -771,7 +771,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
        .features[FEAT_1_EDX] =
            PPRO_FEATURES,
        .features[FEAT_1_ECX] =
            CPUID_EXT_SSE3 | CPUID_EXT_POPCNT,
            CPUID_EXT_SSE3,
        .xlevel = 0x80000004,
    },
    {