From fb8d3e2f6aa430d66ef430eede0d9f9dca0dfa89 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Sat, 3 Mar 2018 14:28:19 -0500 Subject: [PATCH] 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. Backports commit 003a0cf2cd1828a1141a874428571267b117f765 from qemu --- qemu/exec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/qemu/exec.c b/qemu/exec.c index d5dfdd9c..c6992dd1 100644 --- a/qemu/exec.c +++ b/qemu/exec.c @@ -304,10 +304,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; @@ -344,8 +345,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) { @@ -1027,8 +1027,7 @@ static void register_subpage(struct uc_struct* uc, 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); hwaddr start, end; MemoryRegionSection subsection = MemoryRegionSection_make(NULL, NULL, 0, int128_make64(TARGET_PAGE_SIZE), base, false);