Commit 6f612694 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: remove kvm_arch_post_init_vm 



The only statement in a kvm_arch_post_init_vm implementation
can be moved into the x86 kvm_arch_init_vm.  Do so and remove all
traces from architecture-independent code.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 203a5302

arch/x86/kvm/x86.c

+1 −6
Original line number Diff line number Diff line
@@ -12741,6 +12741,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
			     "does not run without ignore_msrs=1, please report it to kvm@vger.kernel.org.\n");

	}



	once_init(&kvm->arch.nx_once);

	return 0;



out_uninit_mmu:
@@ -12750,12 +12751,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	return ret;

}



int kvm_arch_post_init_vm(struct kvm *kvm)

{

	once_init(&kvm->arch.nx_once);

	return 0;

}



static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)

{

	vcpu_load(vcpu);

include/linux/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1615,7 +1615,6 @@ int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu); 
bool kvm_arch_dy_runnable(struct kvm_vcpu *vcpu);

bool kvm_arch_dy_has_pending_interrupt(struct kvm_vcpu *vcpu);

bool kvm_arch_vcpu_preempted_in_kernel(struct kvm_vcpu *vcpu);

int kvm_arch_post_init_vm(struct kvm *kvm);

void kvm_arch_pre_destroy_vm(struct kvm *kvm);

void kvm_arch_create_vm_debugfs(struct kvm *kvm);

virt/kvm/kvm_main.c

+0 −15
Original line number Diff line number Diff line
@@ -1070,15 +1070,6 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, const char *fdname) 
	return ret;

}



/*

 * Called after the VM is otherwise initialized, but just before adding it to

 * the vm_list.

 */

int __weak kvm_arch_post_init_vm(struct kvm *kvm)

{

	return 0;

}



/*

 * Called just after removing the VM from the vm_list, but before doing any

 * other destruction.
@@ -1199,10 +1190,6 @@ static struct kvm *kvm_create_vm(unsigned long type, const char *fdname) 
	if (r)

		goto out_err_no_debugfs;



	r = kvm_arch_post_init_vm(kvm);

	if (r)

		goto out_err;



	mutex_lock(&kvm_lock);

	list_add(&kvm->vm_list, &vm_list);

	mutex_unlock(&kvm_lock);
@@ -1212,8 +1199,6 @@ static struct kvm *kvm_create_vm(unsigned long type, const char *fdname) 


	return kvm;



out_err:

	kvm_destroy_vm_debugfs(kvm);

out_err_no_debugfs:

	kvm_coalesced_mmio_free(kvm);

out_no_coalesced_mmio: