From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 20 May 2013 10:21:07 +0000 (+0200)
Subject: memory: clean up phys_page_find
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~368^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd2989341e758813351c2fc1446cc8fbcae06ad9;p=qemu-upstream-4.5-testing.git

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>
---

diff --git a/exec.c b/exec.c
index 3fdca46a6..3a9ddcb41 100644
--- a/exec.c
+++ b/exec.c
@@ -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)