diff options
| author | Jessica Clarke | 2020-11-16 21:03:19 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2020-11-18 09:31:46 +0100 |
| commit | 65baabca22366e5246955474228908d6a8354881 (patch) | |
| tree | 1378daa7ba50180a7b51e5752d17e7cec05a20c2 /target/i386 | |
| parent | meson: Fixes curses detection on msys2 (diff) | |
| download | qemu-65baabca22366e5246955474228908d6a8354881.tar.gz qemu-65baabca22366e5246955474228908d6a8354881.tar.xz qemu-65baabca22366e5246955474228908d6a8354881.zip | |
hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET
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>
Diffstat (limited to 'target/i386')
| -rw-r--r-- | target/i386/hvf/x86_cpuid.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |