Commit 8b006791 authored by Zhang Xiantao's avatar Zhang Xiantao Committed by Avi Kivity
Browse files

KVM: Portability: Make kvm_vcpu_ioctl_translate arch dependent 



Move kvm_vcpu_ioctl_translate to arch, since mmu would be put under arch.

Signed-off-by: default avatarZhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent e08aa78a

drivers/kvm/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ void kvm_arch_destroy_vm(struct kvm *kvm); 
int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu);

int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu);



int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,

				    struct kvm_translation *tr);



int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs);

int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs);

int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,

drivers/kvm/kvm_main.c

+1 −23
Original line number Diff line number Diff line
@@ -761,28 +761,6 @@ void kvm_resched(struct kvm_vcpu *vcpu) 
}

EXPORT_SYMBOL_GPL(kvm_resched);



/*

 * Translate a guest virtual address to a guest physical address.

 */

static int kvm_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,

				    struct kvm_translation *tr)

{

	unsigned long vaddr = tr->linear_address;

	gpa_t gpa;



	vcpu_load(vcpu);

	mutex_lock(&vcpu->kvm->lock);

	gpa = vcpu->mmu.gva_to_gpa(vcpu, vaddr);

	tr->physical_address = gpa;

	tr->valid = gpa != UNMAPPED_GVA;

	tr->writeable = 1;

	tr->usermode = 0;

	mutex_unlock(&vcpu->kvm->lock);

	vcpu_put(vcpu);



	return 0;

}



static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,

				    struct kvm_interrupt *irq)

{
@@ -986,7 +964,7 @@ static long kvm_vcpu_ioctl(struct file *filp, 
		r = -EFAULT;

		if (copy_from_user(&tr, argp, sizeof tr))

			goto out;

		r = kvm_vcpu_ioctl_translate(vcpu, &tr);

		r = kvm_arch_vcpu_ioctl_translate(vcpu, &tr);

		if (r)

			goto out;

		r = -EFAULT;

drivers/kvm/x86.c

+22 −0
Original line number Diff line number Diff line
@@ -2318,6 +2318,28 @@ struct fxsave { 
#endif

};



/*

 * Translate a guest virtual address to a guest physical address.

 */

int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,

				    struct kvm_translation *tr)

{

	unsigned long vaddr = tr->linear_address;

	gpa_t gpa;



	vcpu_load(vcpu);

	mutex_lock(&vcpu->kvm->lock);

	gpa = vcpu->mmu.gva_to_gpa(vcpu, vaddr);

	tr->physical_address = gpa;

	tr->valid = gpa != UNMAPPED_GVA;

	tr->writeable = 1;

	tr->usermode = 0;

	mutex_unlock(&vcpu->kvm->lock);

	vcpu_put(vcpu);



	return 0;

}



int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	struct fxsave *fxsave = (struct fxsave *)&vcpu->guest_fx_image;