diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-17 22:18:08 +0100 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-01-30 12:50:18 +0100 |
| commit | 934faab464c6a26ed1a226b6cf7111b35405dde1 (patch) | |
| tree | ca920090f0fba7d99865ea865c6746882400dbc4 | |
| parent | lguest: move changed bitmap to lg_cpu (diff) | |
| download | linux-934faab464c6a26ed1a226b6cf7111b35405dde1.tar.xz linux-934faab464c6a26ed1a226b6cf7111b35405dde1.zip | |
lguest: change gpte_addr header
gpte_addr() does not depend on any guest information. So we wipe out
the lg parameter from it completely.
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | drivers/lguest/page_tables.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index c4b8eafda308..c9acafcab2aa 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c @@ -100,8 +100,7 @@ static unsigned long gpgd_addr(struct lg_cpu *cpu, unsigned long vaddr) return cpu->lg->pgdirs[cpu->cpu_pgd].gpgdir + index * sizeof(pgd_t); } -static unsigned long gpte_addr(struct lguest *lg, - pgd_t gpgd, unsigned long vaddr) +static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr) { unsigned long gpage = pgd_pfn(gpgd) << PAGE_SHIFT; BUG_ON(!(pgd_flags(gpgd) & _PAGE_PRESENT)); @@ -235,7 +234,7 @@ int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode) /* OK, now we look at the lower level in the Guest page table: keep its * address, because we might update it later. */ - gpte_ptr = gpte_addr(lg, gpgd, vaddr); + gpte_ptr = gpte_addr(gpgd, vaddr); gpte = lgread(lg, gpte_ptr, pte_t); /* If this page isn't in the Guest page tables, we can't page it in. */ @@ -378,7 +377,7 @@ unsigned long guest_pa(struct lg_cpu *cpu, unsigned long vaddr) if (!(pgd_flags(gpgd) & _PAGE_PRESENT)) kill_guest(cpu->lg, "Bad address %#lx", vaddr); - gpte = lgread(cpu->lg, gpte_addr(cpu->lg, gpgd, vaddr), pte_t); + gpte = lgread(cpu->lg, gpte_addr(gpgd, vaddr), pte_t); if (!(pte_flags(gpte) & _PAGE_PRESENT)) kill_guest(cpu->lg, "Bad address %#lx", vaddr); |