KVM: x86: Move guts of kvm_arch_vcpu_setup() into kvm_arch_vcpu_create() (5f73db11) · Commits · 戴 / test

Fold setup() into create() now that the two are called back-to-back by common KVM code. This paves the way for removing kvm_arch_vcpu_setup(). Signed-off-by:

Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/x86.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -9181,11 +9181,12 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)

		int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
		{
		return kvm_x86_ops->vcpu_create(vcpu);
		}
		int ret;

		ret = kvm_x86_ops->vcpu_create(vcpu);
		if (ret)
		return ret;

		int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
		{
		vcpu->arch.arch_capabilities = kvm_get_arch_capabilities();
		vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT;
		kvm_vcpu_mtrr_init(vcpu);
		@@ -9196,6 +9197,11 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
		return 0;
		}

		int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
		{
		return 0;
		}

		void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
		{
		struct msr_data msr;

Admin message