From patchwork Wed Sep 30 10:18:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 34536 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 ED723B7BA6 for ; Wed, 30 Sep 2009 20:59:43 +1000 (EST) Received: from localhost ([127.0.0.1]:35817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MswuK-0006Lj-6r for incoming@patchwork.ozlabs.org; Wed, 30 Sep 2009 06:59:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MswIW-0004gk-Id for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MswIL-0004Wk-0D for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:31 -0400 Received: from [199.232.76.173] (port=43869 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MswIJ-0004VP-Ql for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:23 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:55873) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MswIH-0005q5-Vi for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:22 -0400 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 525CF49C1E; Wed, 30 Sep 2009 19:20:17 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1MswGc-0003s6-On; Wed, 30 Sep 2009 19:18:38 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Wed, 30 Sep 2009 19:18:04 +0900 Message-Id: <1254305917-14784-29-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> References: <1254305917-14784-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 28/61] pci: factor out while(bus) bus->next loop logic into pci_find_bus_from(). 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 factor out while(bus) bus->next loop logic into pci_find_bus_from() which will be used later. Signed-off-by: Isaku Yamahata --- hw/pci.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 6a28fa5..5d6b3ea 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -577,6 +577,16 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) pci_update_mappings(d); } +static PCIBus *pci_find_bus_from(PCIBus *from, int bus_num) +{ + PCIBus *s = from; + + while (s && s->bus_num != bus_num) + s = s->next; + + return s; +} + void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len) { PCIBus *s = opaque; @@ -588,8 +598,7 @@ void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len) addr, val, len); #endif bus_num = (addr >> 16) & 0xff; - while (s && s->bus_num != bus_num) - s = s->next; + s = pci_find_bus_from(s, bus_num); if (!s) return; pci_dev = s->devices[(addr >> 8) & 0xff]; @@ -610,8 +619,7 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int len) uint32_t val; bus_num = (addr >> 16) & 0xff; - while (s && s->bus_num != bus_num) - s= s->next; + s = pci_find_bus_from(s, bus_num); if (!s) goto fail; pci_dev = s->devices[(addr >> 8) & 0xff]; @@ -795,8 +803,7 @@ void pci_for_each_device(int bus_num, void (*fn)(PCIDevice *d)) PCIDevice *d; int devfn; - while (bus && bus->bus_num != bus_num) - bus = bus->next; + bus = pci_find_bus_from(bus, bus_num); if (bus) { for(devfn = 0; devfn < 256; devfn++) { d = bus->devices[devfn]; @@ -896,12 +903,7 @@ static void pci_bridge_write_config(PCIDevice *d, PCIBus *pci_find_bus(int bus_num) { - PCIBus *bus = first_bus; - - while (bus && bus->bus_num != bus_num) - bus = bus->next; - - return bus; + return pci_find_bus_from(first_bus, bus_num); } PCIDevice *pci_find_device(int bus_num, int slot, int function)