From patchwork Thu Nov 12 05:58:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 38219 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 3C865B70CF for ; Thu, 12 Nov 2009 18:00:44 +1100 (EST) Received: from localhost ([127.0.0.1]:43480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8Tfc-0002ah-NQ for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2009 02:00:40 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8Snv-0000dO-NZ for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:05:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8Snr-0000Zh-0H for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:05:10 -0500 Received: from [199.232.76.173] (port=53911 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8Snp-0000ZH-Pp for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:05:05 -0500 Received: from mx20.gnu.org ([199.232.41.8]:14204) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N8Snp-0001FS-Cu for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:05:05 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8Sno-0007xo-M2 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 01:05:04 -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 127584A416; Thu, 12 Nov 2009 15:04:56 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1N8Shl-0006ci-8f; Thu, 12 Nov 2009 14:58:49 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Thu, 12 Nov 2009 14:58:48 +0900 Message-Id: <1258005528-25383-21-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1258005528-25383-1-git-send-email-yamahata@valinux.co.jp> References: <1258005528-25383-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 mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 20/20] pci: remove goto in pci_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 This patch removes ugly goto in pci_bridge_filter() by introducing subfunction, pci_bridge_filter_nomap(). Signed-off-by: Isaku Yamahata --- hw/pci.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index add919b..90bdf5e 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -691,6 +691,12 @@ static pcibus_t pci_bridge_get_limit(PCIDevice *bridge, uint8_t type) return limit; } +static void pci_bridge_filter_nomap(pcibus_t *addr, pcibus_t *size) +{ + *addr = PCI_BAR_UNMAPPED; + *size = 0; +} + static void pci_bridge_filter(PCIDevice *d, pcibus_t *addr, pcibus_t *size, uint8_t type) { @@ -703,11 +709,13 @@ static void pci_bridge_filter(PCIDevice *d, pcibus_t *addr, pcibus_t *size, if (type & PCI_BASE_ADDRESS_SPACE_IO) { if (!(cmd & PCI_COMMAND_IO)) { - goto no_map; + pci_bridge_filter_nomap(addr, size); + return; } } else { if (!(cmd & PCI_COMMAND_MEMORY)) { - goto no_map; + pci_bridge_filter_nomap(addr, size); + return; } } @@ -716,9 +724,7 @@ static void pci_bridge_filter(PCIDevice *d, pcibus_t *addr, pcibus_t *size, } if (base > limit) { - no_map: - *addr = PCI_BAR_UNMAPPED; - *size = 0; + pci_bridge_filter_nomap(addr, size); } else { *addr = base; *size = limit - base + 1;