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

Commit 2092aa27 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Rusty Russell
Browse files

lguest: change spte_addr header 



spte_addr does not depend on any guest information, so we
wipe out the lg parameter completely.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 1713608f

drivers/lguest/page_tables.c

+4 −4
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static pgd_t *spgd_addr(struct lguest *lg, u32 i, unsigned long vaddr) 
/* This routine then takes the page directory entry returned above, which

 * contains the address of the page table entry (PTE) page.  It then returns a

 * pointer to the PTE entry for the given address. */

static pte_t *spte_addr(struct lguest *lg, pgd_t spgd, unsigned long vaddr)

static pte_t *spte_addr(pgd_t spgd, unsigned long vaddr)

{

	pte_t *page = __va(pgd_pfn(spgd) << PAGE_SHIFT);

	/* You should never call this if the PGD entry wasn't valid */
@@ -261,7 +261,7 @@ int demand_page(struct lg_cpu *cpu, unsigned long vaddr, int errcode) 
		gpte = pte_mkdirty(gpte);



	/* Get the pointer to the shadow PTE entry we're going to set. */

	spte = spte_addr(lg, *spgd, vaddr);

	spte = spte_addr(*spgd, vaddr);

	/* If there was a valid shadow PTE entry here before, we release it.

	 * This can happen with a write to a previously read-only entry. */

	release_pte(*spte);
@@ -310,7 +310,7 @@ static int page_writable(struct lg_cpu *cpu, unsigned long vaddr) 


	/* Check the flags on the pte entry itself: it must be present and

	 * writable. */

	flags = pte_flags(*(spte_addr(cpu->lg, *spgd, vaddr)));

	flags = pte_flags(*(spte_addr(*spgd, vaddr)));



	return (flags & (_PAGE_PRESENT|_PAGE_RW)) == (_PAGE_PRESENT|_PAGE_RW);

}
@@ -509,7 +509,7 @@ static void do_set_pte(struct lguest *lg, int idx, 
	/* If the top level isn't present, there's no entry to update. */

	if (pgd_flags(*spgd) & _PAGE_PRESENT) {

		/* Otherwise, we start by releasing the existing entry. */

		pte_t *spte = spte_addr(lg, *spgd, vaddr);

		pte_t *spte = spte_addr(*spgd, vaddr);

		release_pte(*spte);



		/* If they're setting this entry as dirty or accessed, we might