[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC
From: |
Paolo Bonzini |
Subject: |
[PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET |
Date: |
Wed, 18 Nov 2020 11:19:38 +0100 |
From: Jessica Clarke <jrtc27@jrtc27.com>
Buglink: https://bugs.launchpad.net/qemu/+bug/1894836
Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
Message-Id: <20201116200319.28138-1-jrtc27@jrtc27.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/hvf/x86_cpuid.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
index ac731c2b85..a6842912f5 100644
--- a/target/i386/hvf/x86_cpuid.c
+++ b/target/i386/hvf/x86_cpuid.c
@@ -122,6 +122,10 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t
idx,
CPUID_PAT | CPUID_PSE36 | CPUID_EXT2_MMXEXT | CPUID_MMX |
CPUID_FXSR | CPUID_EXT2_FXSR | CPUID_EXT2_PDPE1GB |
CPUID_EXT2_3DNOWEXT |
CPUID_EXT2_3DNOW | CPUID_EXT2_LM | CPUID_EXT2_RDTSCP |
CPUID_EXT2_NX;
+ hv_vmx_read_capability(HV_VMX_CAP_PROCBASED2, &cap);
+ if (!(cap & CPU_BASED2_RDTSCP)) {
+ edx &= ~CPUID_EXT2_RDTSCP;
+ }
hv_vmx_read_capability(HV_VMX_CAP_PROCBASED, &cap);
if (!(cap & CPU_BASED_TSC_OFFSET)) {
edx &= ~CPUID_EXT2_RDTSCP;
--
2.28.0
- [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Paolo Bonzini, 2020/11/18
- [PULL 1/7] meson: Fix argument for makensis (build regression), Paolo Bonzini, 2020/11/18
- [PULL 2/7] docs: Fix some typos (found by codespell), Paolo Bonzini, 2020/11/18
- [PULL 4/7] meson: Fixes curses detection on msys2, Paolo Bonzini, 2020/11/18
- [PULL 3/7] meson: Fix build with --disable-guest-agent-msi, Paolo Bonzini, 2020/11/18
- [PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET,
Paolo Bonzini <=
- [PULL 6/7] hvf: Fix segment selector format, Paolo Bonzini, 2020/11/18
- [PULL 7/7] buildsys: Help git-diff adding .gitattributes config file, Paolo Bonzini, 2020/11/18
- Re: [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Peter Maydell, 2020/11/18