From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOjRH-0005aI-Au for qemu-devel@nongnu.org; Thu, 18 Oct 2012 02:18:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOjRB-0006LT-FH for qemu-devel@nongnu.org; Thu, 18 Oct 2012 02:18:39 -0400 Received: from thoth.sbs.de ([192.35.17.2]:25563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOjRB-0006LH-5U for qemu-devel@nongnu.org; Thu, 18 Oct 2012 02:18:33 -0400 Message-ID: <507F9F12.5090807@siemens.com> Date: Thu, 18 Oct 2012 08:17:54 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <20121017221215.1997.24717.stgit@bling.home> In-Reply-To: <20121017221215.1997.24717.stgit@bling.home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [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: Alex Williamson Cc: "qemu-devel@nongnu.org" , "mst@redhat.com" On 2012-10-18 00:13, Alex Williamson wrote: > 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); > } > > I'm fine with this. I also see this as dead code in x86 (any x86 chipset will support this API, for sure), but maybe it helps on other archs. So: Acked-by: Jan Kiszka Jan -- Siemens AG, Corporate Technology, CT RTC ITP SDP-DE Corporate Competence Center Embedded Linux