Commit 003a0cf2 authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

exec: simplify phys_page_find() params 



It really only plays with the dispatchers, so the parameter list does
not need that complexity. This helps for readability at least.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1494838260-30439-2-git-send-email-peterx@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent be41c100

exec.c

+6 −7
Original line number Diff line number Diff line
@@ -374,10 +374,11 @@ static inline bool section_covers_addr(const MemoryRegionSection *section, 
                             int128_getlo(section->size), addr);

}



static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr addr,

                                           Node *nodes, MemoryRegionSection *sections)

static MemoryRegionSection *phys_page_find(AddressSpaceDispatch *d, hwaddr addr)

{

    PhysPageEntry *p;

    PhysPageEntry lp = d->phys_map, *p;

    Node *nodes = d->map.nodes;

    MemoryRegionSection *sections = d->map.sections;

    hwaddr index = addr >> TARGET_PAGE_BITS;

    int i;
@@ -415,8 +416,7 @@ static MemoryRegionSection *address_space_lookup_region(AddressSpaceDispatch *d, 
        section_covers_addr(section, addr)) {

        update = false;

    } else {

        section = phys_page_find(d->phys_map, addr, d->map.nodes,

                                 d->map.sections);

        section = phys_page_find(d, addr);

        update = true;

    }

    if (resolve_subpage && section->mr->subpage) {
@@ -1285,8 +1285,7 @@ static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *secti 
    subpage_t *subpage;

    hwaddr base = section->offset_within_address_space

        & TARGET_PAGE_MASK;

    MemoryRegionSection *existing = phys_page_find(d->phys_map, base,

                                                   d->map.nodes, d->map.sections);

    MemoryRegionSection *existing = phys_page_find(d, base);

    MemoryRegionSection subsection = {

        .offset_within_address_space = base,

        .size = int128_make64(TARGET_PAGE_SIZE),