From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ82O-0004BG-Js for qemu-devel@nongnu.org; Tue, 02 Oct 2012 15:21:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJ82I-00023Y-U8 for qemu-devel@nongnu.org; Tue, 02 Oct 2012 15:21:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52961) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ82I-00022b-LD for qemu-devel@nongnu.org; Tue, 02 Oct 2012 15:21:42 -0400 From: Alex Williamson Date: Tue, 02 Oct 2012 13:21:41 -0600 Message-ID: <20121002192139.31100.95177.stgit@bling.home> In-Reply-To: <20121002191609.31100.77382.stgit@bling.home> References: <20121002191609.31100.77382.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/6] pci: Add INTx no-route option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, alex.williamson@redhat.com pci_device_route_intx_to_irq() has no probe capability. vfio-pci can make use of KVM acceleration if this information is available, but can still operate without it. Make it non-fatal to call this on a platform or chipset where it hasn't been implemented yet. Signed-off-by: Alex Williamson --- hw/pci.c | 8 ++++++-- hw/pci.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index f855cf3..9cb0ad4 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1094,8 +1094,12 @@ 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); - return bus->route_intx_to_irq(bus->irq_opaque, pin); + + if (bus->route_intx_to_irq) { + return bus->route_intx_to_irq(bus->irq_opaque, pin); + } + + return (PCIINTxRoute) { PCI_INTX_NOROUTE, -1 }; } void pci_bus_fire_intx_routing_notifier(PCIBus *bus) diff --git a/hw/pci.h b/hw/pci.h index 4b6ab3d..ed1a372 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -146,6 +146,7 @@ typedef struct PCIINTxRoute { PCI_INTX_ENABLED, PCI_INTX_INVERTED, PCI_INTX_DISABLED, + PCI_INTX_NOROUTE, } mode; int irq; } PCIINTxRoute;