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

Commit 230c9a8f authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Merge set_pte() and set_pte_common() 



Since set_pte() is now the only caller of set_pte_common(), merge the two
functions.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 050e6499

drivers/kvm/paging_tmpl.h

+6 −20
Original line number Diff line number Diff line
@@ -186,14 +186,10 @@ static int FNAME(walk_addr)(struct guest_walker *walker, 
	return 0;

}



static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu,

				  u64 *shadow_pte,

				  pt_element_t gpte,

				  u64 access_bits,

				  int user_fault,

				  int write_fault,

				  int *ptwrite,

				  struct guest_walker *walker,

static void FNAME(set_pte)(struct kvm_vcpu *vcpu, pt_element_t gpte,

			   u64 *shadow_pte, u64 access_bits,

			   int user_fault, int write_fault,

			   int *ptwrite, struct guest_walker *walker,

			   gfn_t gfn)

{

	int dirty = gpte & PT_DIRTY_MASK;
@@ -206,6 +202,7 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu, 
		 __FUNCTION__, *shadow_pte, (u64)gpte, access_bits,

		 write_fault, user_fault, gfn);



	access_bits &= gpte;

	/*

	 * We don't set the accessed bit, since we sometimes want to see

	 * whether the guest actually used the pte (in order to detect
@@ -275,17 +272,6 @@ static void FNAME(set_pte_common)(struct kvm_vcpu *vcpu, 
		vcpu->last_pte_updated = shadow_pte;

}



static void FNAME(set_pte)(struct kvm_vcpu *vcpu, pt_element_t gpte,

			   u64 *shadow_pte, u64 access_bits,

			   int user_fault, int write_fault, int *ptwrite,

			   struct guest_walker *walker, gfn_t gfn)

{

	access_bits &= gpte;

	FNAME(set_pte_common)(vcpu, shadow_pte,

			      gpte, access_bits, user_fault, write_fault,

			      ptwrite, walker, gfn);

}



static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *page,

			      u64 *spte, const void *pte, int bytes,

			      int offset_in_pte)