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

Commit d5661048 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Marcelo Tosatti
Browse files

KVM: remove the unused parameter of gfn_to_pfn_memslot 



The parameter, 'kvm', is not used in gfn_to_pfn_memslot, we can happily remove
it

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent f340a51b

arch/powerpc/kvm/e500_tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, 


	if (likely(!pfnmap)) {

		unsigned long tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT);

		pfn = gfn_to_pfn_memslot(vcpu_e500->vcpu.kvm, slot, gfn);

		pfn = gfn_to_pfn_memslot(slot, gfn);

		if (is_error_pfn(pfn)) {

			printk(KERN_ERR "Couldn't get real page for gfn %lx!\n",

					(long)gfn);

arch/x86/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -2518,7 +2518,7 @@ static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, 


	hva = gfn_to_hva_memslot(slot, gfn);



	return hva_to_pfn_atomic(vcpu->kvm, hva);

	return hva_to_pfn_atomic(hva);

}



static int direct_pte_prefetch_many(struct kvm_vcpu *vcpu,

include/linux/kvm_host.h

+2 −3
Original line number Diff line number Diff line
@@ -418,15 +418,14 @@ void kvm_release_page_dirty(struct page *page); 
void kvm_set_page_dirty(struct page *page);

void kvm_set_page_accessed(struct page *page);



pfn_t hva_to_pfn_atomic(struct kvm *kvm, unsigned long addr);

pfn_t hva_to_pfn_atomic(unsigned long addr);

pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn);

pfn_t gfn_to_pfn_async(struct kvm *kvm, gfn_t gfn, bool *async,

		       bool write_fault, bool *writable);

pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn);

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

		      bool *writable);

pfn_t gfn_to_pfn_memslot(struct kvm *kvm,

			 struct kvm_memory_slot *slot, gfn_t gfn);

pfn_t gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn);

void kvm_release_pfn_dirty(pfn_t);

void kvm_release_pfn_clean(pfn_t pfn);

void kvm_set_pfn_dirty(pfn_t pfn);

virt/kvm/iommu.c

+5 −5
Original line number Diff line number Diff line
@@ -42,13 +42,13 @@ static int kvm_iommu_unmap_memslots(struct kvm *kvm); 
static void kvm_iommu_put_pages(struct kvm *kvm,

				gfn_t base_gfn, unsigned long npages);



static pfn_t kvm_pin_pages(struct kvm *kvm, struct kvm_memory_slot *slot,

			   gfn_t gfn, unsigned long size)

static pfn_t kvm_pin_pages(struct kvm_memory_slot *slot, gfn_t gfn,

			   unsigned long size)

{

	gfn_t end_gfn;

	pfn_t pfn;



	pfn     = gfn_to_pfn_memslot(kvm, slot, gfn);

	pfn     = gfn_to_pfn_memslot(slot, gfn);

	end_gfn = gfn + (size >> PAGE_SHIFT);

	gfn    += 1;
@@ -56,7 +56,7 @@ static pfn_t kvm_pin_pages(struct kvm *kvm, struct kvm_memory_slot *slot, 
		return pfn;



	while (gfn < end_gfn)

		gfn_to_pfn_memslot(kvm, slot, gfn++);

		gfn_to_pfn_memslot(slot, gfn++);



	return pfn;

}
@@ -105,7 +105,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot) 
		 * Pin all pages we are about to map in memory. This is

		 * important because we unmap and unpin in 4kb steps later.

		 */

		pfn = kvm_pin_pages(kvm, slot, gfn, page_size);

		pfn = kvm_pin_pages(slot, gfn, page_size);

		if (is_error_pfn(pfn)) {

			gfn += 1;

			continue;

virt/kvm/kvm_main.c

+7 −8
Original line number Diff line number Diff line
@@ -1062,8 +1062,8 @@ static inline int check_user_page_hwpoison(unsigned long addr) 
	return rc == -EHWPOISON;

}



static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic,

			bool *async, bool write_fault, bool *writable)

static pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async,

			bool write_fault, bool *writable)

{

	struct page *page[1];

	int npages = 0;
@@ -1143,9 +1143,9 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic, 
	return pfn;

}



pfn_t hva_to_pfn_atomic(struct kvm *kvm, unsigned long addr)

pfn_t hva_to_pfn_atomic(unsigned long addr)

{

	return hva_to_pfn(kvm, addr, true, NULL, true, NULL);

	return hva_to_pfn(addr, true, NULL, true, NULL);

}

EXPORT_SYMBOL_GPL(hva_to_pfn_atomic);
@@ -1163,7 +1163,7 @@ static pfn_t __gfn_to_pfn(struct kvm *kvm, gfn_t gfn, bool atomic, bool *async, 
		return page_to_pfn(bad_page);

	}



	return hva_to_pfn(kvm, addr, atomic, async, write_fault, writable);

	return hva_to_pfn(addr, atomic, async, write_fault, writable);

}



pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn)
@@ -1192,11 +1192,10 @@ pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault, 
}

EXPORT_SYMBOL_GPL(gfn_to_pfn_prot);



pfn_t gfn_to_pfn_memslot(struct kvm *kvm,

			 struct kvm_memory_slot *slot, gfn_t gfn)

pfn_t gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn)

{

	unsigned long addr = gfn_to_hva_memslot(slot, gfn);

	return hva_to_pfn(kvm, addr, false, NULL, true, NULL);

	return hva_to_pfn(addr, false, NULL, true, NULL);

}



int gfn_to_page_many_atomic(struct kvm *kvm, gfn_t gfn, struct page **pages,