| Message ID | 1447201710-10229-48-git-send-email-benh@kernel.crashing.org |
|---|---|
| State | New |
| Headers | show |
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 7003f7c..b364eff 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1298,7 +1298,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 */
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 <benh@kernel.crashing.org> --- hw/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)