Commit 2142ac66 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86: Co-locate initialization of feature MSRs in kvm_arch_vcpu_create() 

Bunch all of the feature MSR initialization in kvm_arch_vcpu_create() so
that it can be easily quirked in a future patch.

No functional change intended.

Link: https://lore.kernel.org/r/20240802185511.305849-2-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 0e3b70aa

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -12313,6 +12313,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 


	kvm_async_pf_hash_reset(vcpu);



	vcpu->arch.arch_capabilities = kvm_get_arch_capabilities();

	vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT;

	vcpu->arch.perf_capabilities = kvm_caps.supported_perf_cap;

	kvm_pmu_init(vcpu);
@@ -12327,8 +12329,6 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 
	if (r)

		goto free_guest_fpu;



	vcpu->arch.arch_capabilities = kvm_get_arch_capabilities();

	vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT;

	kvm_xen_init_vcpu(vcpu);

	vcpu_load(vcpu);

	kvm_set_tsc_khz(vcpu, vcpu->kvm->arch.default_tsc_khz);