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

Commit 9373e2c0 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: MMU: Remove unused kvm parameter from __gfn_to_rmap() 



Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 3ea8b75e

arch/x86/kvm/mmu.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -946,7 +946,7 @@ static void pte_list_walk(unsigned long *pte_list, pte_list_walk_fn fn) 
	}

	}

}

}





static unsigned long *__gfn_to_rmap(struct kvm *kvm, gfn_t gfn, int level,

static unsigned long *__gfn_to_rmap(gfn_t gfn, int level,

				    struct kvm_memory_slot *slot)

				    struct kvm_memory_slot *slot)

{

{

	struct kvm_lpage_info *linfo;

	struct kvm_lpage_info *linfo;
@@ -966,7 +966,7 @@ static unsigned long *gfn_to_rmap(struct kvm *kvm, gfn_t gfn, int level) 
	struct kvm_memory_slot *slot;

	struct kvm_memory_slot *slot;





	slot = gfn_to_memslot(kvm, gfn);

	slot = gfn_to_memslot(kvm, gfn);

	return __gfn_to_rmap(kvm, gfn, level, slot);

	return __gfn_to_rmap(gfn, level, slot);

}

}





static bool rmap_can_add(struct kvm_vcpu *vcpu)

static bool rmap_can_add(struct kvm_vcpu *vcpu)
@@ -1018,7 +1018,7 @@ int kvm_mmu_rmap_write_protect(struct kvm *kvm, u64 gfn, 
	u64 *spte;

	u64 *spte;

	int i, write_protected = 0;

	int i, write_protected = 0;





	rmapp = __gfn_to_rmap(kvm, gfn, PT_PAGE_TABLE_LEVEL, slot);

	rmapp = __gfn_to_rmap(gfn, PT_PAGE_TABLE_LEVEL, slot);

	spte = rmap_next(kvm, rmapp, NULL);

	spte = rmap_next(kvm, rmapp, NULL);

	while (spte) {

	while (spte) {

		BUG_ON(!(*spte & PT_PRESENT_MASK));

		BUG_ON(!(*spte & PT_PRESENT_MASK));
@@ -1033,7 +1033,7 @@ int kvm_mmu_rmap_write_protect(struct kvm *kvm, u64 gfn, 
	/* check for huge page mappings */

	/* check for huge page mappings */

	for (i = PT_DIRECTORY_LEVEL;

	for (i = PT_DIRECTORY_LEVEL;

	     i < PT_PAGE_TABLE_LEVEL + KVM_NR_PAGE_SIZES; ++i) {

	     i < PT_PAGE_TABLE_LEVEL + KVM_NR_PAGE_SIZES; ++i) {

		rmapp = __gfn_to_rmap(kvm, gfn, i, slot);

		rmapp = __gfn_to_rmap(gfn, i, slot);

		spte = rmap_next(kvm, rmapp, NULL);

		spte = rmap_next(kvm, rmapp, NULL);

		while (spte) {

		while (spte) {

			BUG_ON(!(*spte & PT_PRESENT_MASK));

			BUG_ON(!(*spte & PT_PRESENT_MASK));