Signed-off-by: Robert Hoo <robert.hu@xxxxxxxxxxxxxxx>
---
arch/x86/kvm/cpuid.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index efa7182..1d206aa 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -217,32 +217,16 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu)
static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)
{
- struct kvm_lapic *apic = vcpu->arch.apic;
- struct kvm_cpuid_entry2 *best;
-
kvm_x86_ops.vcpu_after_set_cpuid(vcpu);
- best = kvm_find_cpuid_entry(vcpu, 1, 0);
- if (best && apic) {
- if (cpuid_entry_has(best, X86_FEATURE_TSC_DEADLINE_TIMER))
- apic->lapic_timer.timer_mode_mask = 3 << 17;
- else
- apic->lapic_timer.timer_mode_mask = 1 << 17;
+ kvm_update_lapic_timer_mode(vcpu);
+ kvm_apic_set_version(vcpu);
- kvm_apic_set_version(vcpu);
- }
+ kvm_xcr0_update_cpuid(vcpu);
- best = kvm_find_cpuid_entry(vcpu, 0xD, 0);
- if (!best)
- vcpu->arch.guest_supported_xcr0 = 0;
- else
- vcpu->arch.guest_supported_xcr0 =
- (best->eax | ((u64)best->edx << 32)) & supported_xcr0;
+ kvm_update_maxphyaddr(vcpu);
- /* Note, maxphyaddr must be updated before tdp_level. */
- vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
- vcpu->arch.tdp_level = kvm_x86_ops.get_tdp_level(vcpu);
- kvm_mmu_reset_context(vcpu);
+ kvm_pv_unhalt_update_cpuid(vcpu);
kvm_pmu_refresh(vcpu);
vcpu->arch.cr4_guest_rsvd_bits =
--
1.8.3.1
