diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2009-11-12 13:54:31 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2009-12-01 17:52:51 +0200 |
| commit | 88a9556430df57cbe7666e4e4cf78c3bd3bc8220 (patch) | |
| tree | 45146584d748f54d76fed58830ac226a606cc5ee /hw/pci.c | |
| parent | d46636b88339ecc2cb8d10113f45ada164817773 (diff) | |
| download | focaccia-qemu-88a9556430df57cbe7666e4e4cf78c3bd3bc8220.tar.gz focaccia-qemu-88a9556430df57cbe7666e4e4cf78c3bd3bc8220.zip | |
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>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/hw/pci.c b/hw/pci.c index e26b3d0341..8cf008d31d 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, |