diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2014-04-26 22:30:23 -0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-07-21 08:36:10 +0200 |
| commit | a992f642bfd59c3595045fe38f3292ce577b7136 (patch) | |
| tree | 35a66cbee6ac4dc55c8a3aad26beaa9b6c9532c8 | |
| parent | 8617fe9e3573cd7d465c9f4d4e88fa29d1e63271 (diff) | |
KVM: x86: expose invariant tsc cpuid bit (v2)
commit e4c9a5a17567f8ea975bdcfdd1bf9d63965de6c9 upstream.
Invariant TSC is a property of TSC, no additional
support code necessary.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | arch/x86/kvm/cpuid.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index b132551528e5..6620ac307215 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -437,6 +437,13 @@ static int do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, entry->ecx &= kvm_supported_word6_x86_features; cpuid_mask(&entry->ecx, 6); break; + case 0x80000007: /* Advanced power management */ + /* invariant TSC is CPUID.80000007H:EDX[8] */ + entry->edx &= (1 << 8); + /* mask against host */ + entry->edx &= boot_cpu_data.x86_power; + entry->eax = entry->ebx = entry->ecx = 0; + break; case 0x80000008: { unsigned g_phys_as = (entry->eax >> 16) & 0xff; unsigned virt_as = max((entry->eax >> 8) & 0xff, 48U); @@ -467,7 +474,6 @@ static int do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, case 3: /* Processor serial number */ case 5: /* MONITOR/MWAIT */ case 6: /* Thermal management */ - case 0x80000007: /* Advanced power management */ case 0xC0000002: case 0xC0000003: case 0xC0000004: |