From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBWrK-0008GV-RU for qemu-devel@nongnu.org; Sat, 04 Jul 2015 19:28:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBWrH-00006f-KV for qemu-devel@nongnu.org; Sat, 04 Jul 2015 19:28:34 -0400 Received: from gate.crashing.org ([63.228.1.57]:48975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBWrH-0008Vg-Ag for qemu-devel@nongnu.org; Sat, 04 Jul 2015 19:28:31 -0400 Message-ID: <1436052508.3948.41.camel@kernel.crashing.org> From: Benjamin Herrenschmidt Date: Sun, 05 Jul 2015 09:28:28 +1000 Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] pci: Don't call pci_irq_handler() for a negative intx List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" Under some circumstances, pci_intx() can return -1 (when the interrupt pin in the config space is 0 which normally means no interrupt). I have seen cases of pci_set_irq() being called on such devices, in turn causing pci_irq_handler() to be called with "-1" as an argument which doesn't seem like a terribly good idea. Signed-off-by: Benjamin Herrenschmidt --- hw/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 8185bbc..eea6f5d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1281,7 +1281,9 @@ qemu_irq pci_allocate_irq(PCIDevice *pci_dev) void pci_set_irq(PCIDevice *pci_dev, int level) { int intx = pci_intx(pci_dev); - pci_irq_handler(pci_dev, intx, level); + if (intx >= 0) { + pci_irq_handler(pci_dev, intx, level); + } } /* Special hooks used by device assignment */