diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-13 13:16:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-13 13:16:35 +0000 |
| commit | f962709c69a05183bf314d3d8c69802d1e3f139c (patch) | |
| tree | 2a121ac278ccbed5e2624b282572fa0377bf8f94 /include | |
| parent | b1616fe0e2a311f5951cc51800a17a920b20a129 (diff) | |
| parent | ec56a4a7b07e2943f49da273a31e3195083b1f2e (diff) | |
| download | qemu-f962709c69a05183bf314d3d8c69802d1e3f139c.zip qemu-f962709c69a05183bf314d3d8c69802d1e3f139c.tar.gz qemu-f962709c69a05183bf314d3d8c69802d1e3f139c.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
x86: Haswell TSX blacklist fix for 2.9
# gpg: Signature made Fri 10 Mar 2017 18:45:08 GMT
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-pull-request:
i386: Change stepping of Haswell to non-blacklisted value
i386/kvm: Blacklist TSX on known broken hosts
i386: host_vendor_fms() helper function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ab303c7..f278b3a 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 \ |