diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2017-03-09 15:12:12 -0300 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-03-10 15:01:09 -0300 |
| commit | ec56a4a7b07e2943f49da273a31e3195083b1f2e (patch) | |
| tree | b5a466451b05e13429e613d9c8e75507e8d318d7 | |
| parent | 40e80ee4113ad957b633cbdddb7423952bb76974 (diff) | |
i386: Change stepping of Haswell to non-blacklisted value
glibc blacklists TSX on Haswell CPUs with model==60 and
stepping < 4. To make the Haswell CPU model more useful, make
those guests actually use TSX by changing CPU stepping to 4.
References:
* glibc commit 2702856bf45c82cf8e69f2064f5aa15c0ceb6359
https://sourceware.org/git/?p=glibc.git;a=commit;h=2702856bf45c82cf8e69f2064f5aa15c0ceb6359
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170309181212.18864-4-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | include/hw/i386/pc.h | 5 | ||||
| -rw-r--r-- | target/i386/cpu.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ab303c7fee..f278b3ae89 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -389,6 +389,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = TYPE_X86_CPU,\ .property = "vmware-cpuid-freq",\ .value = "off",\ + },\ + {\ + .driver = "Haswell-" TYPE_X86_CPU,\ + .property = "stepping",\ + .value = "1",\ }, #define PC_COMPAT_2_7 \ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 30ba1bd06b..7aa762245a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1196,7 +1196,7 @@ static X86CPUDefinition builtin_x86_defs[] = { .vendor = CPUID_VENDOR_INTEL, .family = 6, .model = 60, - .stepping = 1, + .stepping = 4, .features[FEAT_1_EDX] = CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA | |