diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-20 12:21:07 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-24 18:43:54 +0200 |
commit | fd2989341e758813351c2fc1446cc8fbcae06ad9 (patch) | |
tree | 4821e93ddc274bd4050d6059dce661721c9e8c4d | |
parent | f43793c7caab49c68b41c3b8524fc35b4c206856 (diff) | |
download | hqemu-fd2989341e758813351c2fc1446cc8fbcae06ad9.zip hqemu-fd2989341e758813351c2fc1446cc8fbcae06ad9.tar.gz |
memory: clean up phys_page_find
Remove the goto.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | exec.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -187,19 +187,15 @@ MemoryRegionSection *phys_page_find(AddressSpaceDispatch *d, hwaddr index) PhysPageEntry lp = d->phys_map; PhysPageEntry *p; int i; - uint16_t s_index = phys_section_unassigned; for (i = P_L2_LEVELS - 1; i >= 0 && !lp.is_leaf; i--) { if (lp.ptr == PHYS_MAP_NODE_NIL) { - goto not_found; + return &phys_sections[phys_section_unassigned]; } p = phys_map_nodes[lp.ptr]; lp = p[(index >> (i * L2_BITS)) & (L2_SIZE - 1)]; } - - s_index = lp.ptr; -not_found: - return &phys_sections[s_index]; + return &phys_sections[lp.ptr]; } bool memory_region_is_unassigned(MemoryRegion *mr) |