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

Commit e37afc6e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: remove __gfn_to_pfn 



Most of the function that wrap it can be rewritten without it, except
for gfn_to_pfn_prot.  Just inline it into gfn_to_pfn_prot, and rewrite
the other function on top of gfn_to_pfn_memslot*.

Reviewed-by: default avatarRadim Krcmar <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d9ef13c2

virt/kvm/kvm_main.c

+15 −24
Original line number Diff line number Diff line
@@ -1387,33 +1387,11 @@ pfn_t __gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn, bool atomic, 
}

EXPORT_SYMBOL_GPL(__gfn_to_pfn_memslot);



static pfn_t __gfn_to_pfn(struct kvm *kvm, gfn_t gfn, bool atomic,

			  bool write_fault, bool *writable)

{

	struct kvm_memory_slot *slot;



	slot = gfn_to_memslot(kvm, gfn);



	return __gfn_to_pfn_memslot(slot, gfn, atomic, NULL, write_fault,

				    writable);

}



pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn)

{

	return __gfn_to_pfn(kvm, gfn, true, true, NULL);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn_atomic);



pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn)

{

	return __gfn_to_pfn(kvm, gfn, false, true, NULL);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn);



pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,

		      bool *writable)

{

	return __gfn_to_pfn(kvm, gfn, false, write_fault, writable);

	return __gfn_to_pfn_memslot(gfn_to_memslot(kvm, gfn), gfn, false, NULL,

				    write_fault, writable);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn_prot);
@@ -1421,6 +1399,7 @@ pfn_t gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn) 
{

	return __gfn_to_pfn_memslot(slot, gfn, false, NULL, true, NULL);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot);



pfn_t gfn_to_pfn_memslot_atomic(struct kvm_memory_slot *slot, gfn_t gfn)

{
@@ -1428,6 +1407,18 @@ pfn_t gfn_to_pfn_memslot_atomic(struct kvm_memory_slot *slot, gfn_t gfn) 
}

EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot_atomic);



pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn)

{

	return gfn_to_pfn_memslot_atomic(gfn_to_memslot(kvm, gfn), gfn);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn_atomic);



pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn)

{

	return gfn_to_pfn_memslot(gfn_to_memslot(kvm, gfn), gfn);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn);



int gfn_to_page_many_atomic(struct kvm_memory_slot *slot, gfn_t gfn,

			    struct page **pages, int nr_pages)

{