Commit 630766b3 authored by James Hogan's avatar James Hogan
Browse files

KVM: MIPS: Wire up vcpu uninit 



Wire up a vcpu uninit implementation callback. This will be used for the
clean up of GVA->HPA page tables.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
parent a7ebb2e4

arch/mips/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ struct kvm_mips_callbacks { 
	int (*handle_msa_disabled)(struct kvm_vcpu *vcpu);

	int (*vm_init)(struct kvm *kvm);

	int (*vcpu_init)(struct kvm_vcpu *vcpu);

	void (*vcpu_uninit)(struct kvm_vcpu *vcpu);

	int (*vcpu_setup)(struct kvm_vcpu *vcpu);

	gpa_t (*gva_to_gpa)(gva_t gva);

	void (*queue_timer_int)(struct kvm_vcpu *vcpu);
@@ -765,7 +766,6 @@ static inline void kvm_arch_memslots_updated(struct kvm *kvm, struct kvm_memslot 
static inline void kvm_arch_flush_shadow_all(struct kvm *kvm) {}

static inline void kvm_arch_flush_shadow_memslot(struct kvm *kvm,

		struct kvm_memory_slot *slot) {}

static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}

static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {}

arch/mips/kvm/mips.c

+5 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,11 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	return 0;

}



void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)

{

	kvm_mips_callbacks->vcpu_uninit(vcpu);

}



int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,

				  struct kvm_translation *tr)

{

arch/mips/kvm/trap_emul.c

+5 −0
Original line number Diff line number Diff line
@@ -440,6 +440,10 @@ static int kvm_trap_emul_vcpu_init(struct kvm_vcpu *vcpu) 
	return 0;

}



static void kvm_trap_emul_vcpu_uninit(struct kvm_vcpu *vcpu)

{

}



static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu)

{

	struct mips_coproc *cop0 = vcpu->arch.cop0;
@@ -779,6 +783,7 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = { 


	.vm_init = kvm_trap_emul_vm_init,

	.vcpu_init = kvm_trap_emul_vcpu_init,

	.vcpu_uninit = kvm_trap_emul_vcpu_uninit,

	.vcpu_setup = kvm_trap_emul_vcpu_setup,

	.gva_to_gpa = kvm_trap_emul_gva_to_gpa_cb,

	.queue_timer_int = kvm_mips_queue_timer_int_cb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE