Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3180a7fc authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: remove kvm_read_hva and kvm_read_hva_atomic 



The corresponding write functions just use __copy_to_user.  Do the
same on the read side.

This reverts what's left of commit 86ab8cff (KVM: introduce
gfn_to_hva_read/kvm_read_hva/kvm_read_hva_atomic, 2012-08-21)

Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <1427976500-28533-1-git-send-email-pbonzini@redhat.com>
parent 9c8fd1ba

virt/kvm/kvm_main.c

+2 −12
Original line number Diff line number Diff line
@@ -1187,16 +1187,6 @@ unsigned long gfn_to_hva_prot(struct kvm *kvm, gfn_t gfn, bool *writable) 
	return gfn_to_hva_memslot_prot(slot, gfn, writable);

}



static int kvm_read_hva(void *data, void __user *hva, int len)

{

	return __copy_from_user(data, hva, len);

}



static int kvm_read_hva_atomic(void *data, void __user *hva, int len)

{

	return __copy_from_user_inatomic(data, hva, len);

}



static int get_user_page_nowait(struct task_struct *tsk, struct mm_struct *mm,

	unsigned long start, int write, struct page **page)

{
@@ -1548,7 +1538,7 @@ int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset, 
	addr = gfn_to_hva_prot(kvm, gfn, NULL);

	if (kvm_is_error_hva(addr))

		return -EFAULT;

	r = kvm_read_hva(data, (void __user *)addr + offset, len);

	r = __copy_from_user(data, (void __user *)addr + offset, len);

	if (r)

		return -EFAULT;

	return 0;
@@ -1587,7 +1577,7 @@ int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data, 
	if (kvm_is_error_hva(addr))

		return -EFAULT;

	pagefault_disable();

	r = kvm_read_hva_atomic(data, (void __user *)addr + offset, len);

	r = __copy_from_user_inatomic(data, (void __user *)addr + offset, len);

	pagefault_enable();

	if (r)

		return -EFAULT;