From: Michael S. Tsirkin <mst@redhat.com>
Date: Thu, 12 Nov 2009 11:54:31 +0000 (+0200)
Subject: pci: convert goto into scope in bridge_filter
X-Git-Tag: v0.12.0-rc0~228^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88a9556430df57cbe7666e4e4cf78c3bd3bc8220;p=thirdparty%2Fqemu.git

pci: convert goto into scope in bridge_filter

goto into scope is evil. rearrange pci_bridge_filter
so that we always go to end of function on error.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Isaku Yamahata <yamahata@valinux.co.jp>
---

diff --git a/hw/pci.c b/hw/pci.c
index e26b3d0341b..8cf008d31d1 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -717,13 +717,14 @@ static void pci_bridge_filter(PCIDevice *d, pcibus_t *addr, pcibus_t *size,
     }
 
     if (base > limit) {
-    no_map:
-        *addr = PCI_BAR_UNMAPPED;
-        *size = 0;
-    } else {
-        *addr = base;
-        *size = limit - base + 1;
+        goto no_map;
     }
+    *addr = base;
+    *size = limit - base + 1;
+    return;
+no_map:
+    *addr = PCI_BAR_UNMAPPED;
+    *size = 0;
 }
 
 static pcibus_t pci_bar_address(PCIDevice *d,