From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDkDi-0006Eh-OK for qemu-devel@nongnu.org; Thu, 07 Mar 2013 18:27:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDkDh-0008Ba-Np for qemu-devel@nongnu.org; Thu, 07 Mar 2013 18:27:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDk3U-0005KN-68 for qemu-devel@nongnu.org; Thu, 07 Mar 2013 18:16:56 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r27NGt9D016926 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Mar 2013 18:16:55 -0500 From: Alex Williamson Date: Thu, 07 Mar 2013 16:16:54 -0700 Message-ID: <20130307231654.31144.71041.stgit@bling.home> In-Reply-To: <20130307230844.31144.93342.stgit@bling.home> References: <20130307230844.31144.93342.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/2] pci_bridge: Use a default map_irq function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: qemu-devel@nongnu.org The PCI bridge spec defines a default swizzle for translating INTx IRQs from secondary bus to primary. Use this by default for any bridge that doesn't set a function. Signed-off-by: Alex Williamson --- hw/pci/pci_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 84e7c19..5d27fa2 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -367,7 +367,7 @@ int pci_bridge_initfn(PCIDevice *dev) qbus_create_inplace(&sec_bus->qbus, TYPE_PCI_BUS, &dev->qdev, br->bus_name); sec_bus->parent_dev = dev; - sec_bus->map_irq = br->map_irq; + sec_bus->map_irq = br->map_irq ? br->map_irq : pci_swizzle_map_irq_fn; sec_bus->address_space_mem = &br->address_space_mem; memory_region_init(&br->address_space_mem, "pci_bridge_pci", INT64_MAX); sec_bus->address_space_io = &br->address_space_io;