Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 80826
b: refs/heads/master
c: 2fbf4cf
h: refs/heads/master
v: v3
  • Loading branch information
Avi Kivity committed Jan 30, 2008
1 parent ccb7c6b commit 76900cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e3f955042219a595b1c3208e12c20860f23f72fb
refs/heads/master: 2fbf4cf13f777e1f61ee692fe67d16bddd747700
7 changes: 3 additions & 4 deletions trunk/drivers/kvm/paging_tmpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
static void FNAME(set_pte)(struct kvm_vcpu *vcpu, u64 *shadow_pte,
unsigned pt_access, unsigned pte_access,
int user_fault, int write_fault, int dirty,
int *ptwrite, struct guest_walker *walker,
gfn_t gfn)
int *ptwrite, gfn_t gfn)
{
u64 spte;
int was_rmapped = is_rmap_pte(*shadow_pte);
Expand Down Expand Up @@ -337,7 +336,7 @@ static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *page,
pgprintk("%s: gpte %llx spte %p\n", __FUNCTION__, (u64)gpte, spte);
pte_access = page->role.access & FNAME(gpte_access)(vcpu, gpte);
FNAME(set_pte)(vcpu, spte, page->role.access, pte_access, 0, 0,
gpte & PT_DIRTY_MASK, NULL, NULL, gpte_to_gfn(gpte));
gpte & PT_DIRTY_MASK, NULL, gpte_to_gfn(gpte));
}

/*
Expand Down Expand Up @@ -402,7 +401,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,

FNAME(set_pte)(vcpu, shadow_ent, access, walker->pte_access & access,
user_fault, write_fault, walker->pte & PT_DIRTY_MASK,
ptwrite, walker, walker->gfn);
ptwrite, walker->gfn);

return shadow_ent;
}
Expand Down

0 comments on commit 76900cf

Please sign in to comment.