Commit 607ef2fd authored by James Hogan's avatar James Hogan
Browse files

KVM: MIPS: Add callback to check extension 



Add an implementation callback for checking presence of KVM extensions.
This allows implementation specific extensions to be provided without
ifdefs in mips.c.

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 a517c1ad

arch/mips/include/asm/kvm_host.h

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

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

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

	int (*check_extension)(struct kvm *kvm, long ext);

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

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

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

arch/mips/kvm/mips.c

+1 −2
Original line number Diff line number Diff line
@@ -1043,7 +1043,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_READONLY_MEM:

	case KVM_CAP_SYNC_MMU:

	case KVM_CAP_IMMEDIATE_EXIT:

	case KVM_CAP_MIPS_TE:

		r = 1;

		break;

	case KVM_CAP_COALESCED_MMIO:
@@ -1075,7 +1074,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		r = cpu_has_msa && !(boot_cpu_data.msa_id & MSA_IR_WRPF);

		break;

	default:

		r = 0;

		r = kvm_mips_callbacks->check_extension(kvm, ext);

		break;

	}

	return r;

arch/mips/kvm/trap_emul.c

+17 −0
Original line number Diff line number Diff line
@@ -488,6 +488,22 @@ static int kvm_trap_emul_handle_msa_disabled(struct kvm_vcpu *vcpu) 
	return ret;

}



static int kvm_trap_emul_check_extension(struct kvm *kvm, long ext)

{

	int r;



	switch (ext) {

	case KVM_CAP_MIPS_TE:

		r = 1;

		break;

	default:

		r = 0;

		break;

	}



	return r;

}



static int kvm_trap_emul_vcpu_init(struct kvm_vcpu *vcpu)

{

	struct mm_struct *kern_mm = &vcpu->arch.guest_kernel_mm;
@@ -1238,6 +1254,7 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = { 
	.handle_fpe = kvm_trap_emul_handle_fpe,

	.handle_msa_disabled = kvm_trap_emul_handle_msa_disabled,



	.check_extension = kvm_trap_emul_check_extension,

	.vcpu_init = kvm_trap_emul_vcpu_init,

	.vcpu_uninit = kvm_trap_emul_vcpu_uninit,

	.vcpu_setup = kvm_trap_emul_vcpu_setup,