From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TObrY-0007q9-34 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 18:13:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TObrW-0006Ki-Ux for qemu-devel@nongnu.org; Wed, 17 Oct 2012 18:13:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TObrW-0006Kd-Mh for qemu-devel@nongnu.org; Wed, 17 Oct 2012 18:13:14 -0400 From: Alex Williamson Date: Wed, 17 Oct 2012 16:13:12 -0600 Message-ID: <20121017221215.1997.24717.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v2] pci: Return PCI_INTX_DISABLED when no bus INTx routing support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: jan.kiszka@siemens.com, alex.williamson@redhat.com, qemu-devel@nongnu.org Rather than assert, simply return PCI_INTX_DISABLED when we don't have a pci_route_irq_fn. PIIX already returns DISABLED for an invalid pin, so users already deal with this state. Users of this interface should only be acting on an ENABLED or INVERTED return value (though we really have no support for INVERTED). Also complain loudly when we hit this so we don't forget it's missing. Signed-off-by: Alex Williamson --- v2: Turn up the annoyance factor for hitting this hw/pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/pci.c b/hw/pci.c index 83d262a..6a66b32 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1094,7 +1094,13 @@ PCIINTxRoute pci_device_route_intx_to_irq(PCIDevice *dev, int pin) pin = bus->map_irq(dev, pin); dev = bus->parent_dev; } while (dev); - assert(bus->route_intx_to_irq); + + if (!bus->route_intx_to_irq) { + error_report("PCI: Bug - unimplemented PCI INTx routing (%s)\n", + object_get_typename(OBJECT(bus->qbus.parent))); + return (PCIINTxRoute) { PCI_INTX_DISABLED, -1 }; + } + return bus->route_intx_to_irq(bus->irq_opaque, pin); }