提交 003a0cf2 编写于 作者: P Peter Xu 提交者: Paolo Bonzini

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: NPeter Xu <peterx@redhat.com>
Message-Id: <1494838260-30439-2-git-send-email-peterx@redhat.com>
Reviewed-by: NDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 be41c100
...@@ -374,10 +374,11 @@ static inline bool section_covers_addr(const MemoryRegionSection *section, ...@@ -374,10 +374,11 @@ static inline bool section_covers_addr(const MemoryRegionSection *section,
int128_getlo(section->size), addr); int128_getlo(section->size), addr);
} }
static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr addr, static MemoryRegionSection *phys_page_find(AddressSpaceDispatch *d, hwaddr addr)
Node *nodes, MemoryRegionSection *sections)
{ {
PhysPageEntry *p; PhysPageEntry lp = d->phys_map, *p;
Node *nodes = d->map.nodes;
MemoryRegionSection *sections = d->map.sections;
hwaddr index = addr >> TARGET_PAGE_BITS; hwaddr index = addr >> TARGET_PAGE_BITS;
int i; int i;
...@@ -415,8 +416,7 @@ static MemoryRegionSection *address_space_lookup_region(AddressSpaceDispatch *d, ...@@ -415,8 +416,7 @@ static MemoryRegionSection *address_space_lookup_region(AddressSpaceDispatch *d,
section_covers_addr(section, addr)) { section_covers_addr(section, addr)) {
update = false; update = false;
} else { } else {
section = phys_page_find(d->phys_map, addr, d->map.nodes, section = phys_page_find(d, addr);
d->map.sections);
update = true; update = true;
} }
if (resolve_subpage && section->mr->subpage) { if (resolve_subpage && section->mr->subpage) {
...@@ -1285,8 +1285,7 @@ static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *secti ...@@ -1285,8 +1285,7 @@ static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *secti
subpage_t *subpage; subpage_t *subpage;
hwaddr base = section->offset_within_address_space hwaddr base = section->offset_within_address_space
& TARGET_PAGE_MASK; & TARGET_PAGE_MASK;
MemoryRegionSection *existing = phys_page_find(d->phys_map, base, MemoryRegionSection *existing = phys_page_find(d, base);
d->map.nodes, d->map.sections);
MemoryRegionSection subsection = { MemoryRegionSection subsection = {
.offset_within_address_space = base, .offset_within_address_space = base,
.size = int128_make64(TARGET_PAGE_SIZE), .size = int128_make64(TARGET_PAGE_SIZE),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册