From patchwork Fri Nov 13 04:29:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 38337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F04341007D1 for ; Fri, 13 Nov 2009 16:13:53 +1100 (EST) Received: from localhost ([127.0.0.1]:35806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8oTl-0001Pq-AX for incoming@patchwork.ozlabs.org; Fri, 13 Nov 2009 00:13:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8oMy-0000dR-Hn for qemu-devel@nongnu.org; Fri, 13 Nov 2009 00:06:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8oMt-0000VV-HY for qemu-devel@nongnu.org; Fri, 13 Nov 2009 00:06:48 -0500 Received: from [199.232.76.173] (port=57372 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8oMs-0000Uo-U2 for qemu-devel@nongnu.org; Fri, 13 Nov 2009 00:06:42 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:43717) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8oMs-00077L-8t for qemu-devel@nongnu.org; Fri, 13 Nov 2009 00:06:42 -0500 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 567584A421; Fri, 13 Nov 2009 13:36:04 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1N8nnJ-0000x5-AF; Fri, 13 Nov 2009 13:29:57 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Fri, 13 Nov 2009 13:29:56 +0900 Message-Id: <1258086596-3584-21-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1258086596-3584-1-git-send-email-yamahata@valinux.co.jp> References: <1258086596-3584-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V2 20/20] pci: convert goto into scope in bridge_filter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Michael S. Tsirkin 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 Acked-by: Isaku Yamahata --- hw/pci.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 7d930eb..a06003e 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -716,13 +716,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,