From patchwork Fri Nov 13 04:29:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 38320 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 31C061007D2 for ; Fri, 13 Nov 2009 15:44:04 +1100 (EST) Received: from localhost ([127.0.0.1]:40935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8o0v-0003Ks-Ic for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2009 23:44:01 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8ntR-0000J4-5o for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:17 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8ntK-0000EI-PY for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:15 -0500 Received: from [199.232.76.173] (port=50447 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8ntK-0000E3-BL for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:10 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:35521) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8ntJ-0002e4-RW for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:10 -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 3572D4A415; Fri, 13 Nov 2009 13:36:02 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1N8nnI-0000wS-Pb; Fri, 13 Nov 2009 13:29:56 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Fri, 13 Nov 2009 13:29:43 +0900 Message-Id: <1258086596-3584-8-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 07/20] pci: remove pci_sub_bus() by open coding. 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 Because pci_sub_bus() is used only once so eliminate it by open coding as suggested by "Michael S. Tsirkin" . Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- hw/pci.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 4169d4f..ca22405 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -239,13 +239,6 @@ int pci_bus_num(PCIBus *s) return s->parent_dev->config[PCI_SECONDARY_BUS]; } -static uint8_t pci_sub_bus(PCIBus *s) -{ - if (!s->parent_dev) - return 255; /* pci host bridge */ - return s->parent_dev->config[PCI_SUBORDINATE_BUS]; -} - static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) { PCIDevice *s = container_of(pv, PCIDevice, config); @@ -1179,7 +1172,9 @@ PCIBus *pci_find_bus(PCIBus *bus, int bus_num) /* try child bus */ QLIST_FOREACH(sec, &bus->child, sibling) { - if (pci_bus_num(sec) <= bus_num && bus_num <= pci_sub_bus(sec)) { + if (!bus->parent_dev /* pci host bridge */ + || (pci_bus_num(sec) <= bus_num && + bus->parent_dev->config[PCI_SUBORDINATE_BUS])) { return pci_find_bus(sec, bus_num); } }