Skip to content

Commit 399537b

Browse files
committed
Merge tag 'vfio-v6.15-rc3' of https://github.com/awilliam/linux-vfio
Pull vfio fix from Alex Williamson: - Include devices where the platform indicates PCI INTx is not routed by setting pdev->irq to zero in the expanded virtualization of the PCI pin register. This provides consistency in the INFO and SET_IRQS ioctls (Alex Williamson) * tag 'vfio-v6.15-rc3' of https://github.com/awilliam/linux-vfio: vfio/pci: Virtualize zero INTx PIN if no pdev->irq
2 parents 272876d + 2bd42b0 commit 399537b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/vfio/pci/vfio_pci_config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1815,7 +1815,7 @@ int vfio_config_init(struct vfio_pci_core_device *vdev)
18151815
}
18161816

18171817
if (!IS_ENABLED(CONFIG_VFIO_PCI_INTX) || vdev->nointx ||
1818-
vdev->pdev->irq == IRQ_NOTCONNECTED)
1818+
!vdev->pdev->irq || vdev->pdev->irq == IRQ_NOTCONNECTED)
18191819
vconfig[PCI_INTERRUPT_PIN] = 0;
18201820

18211821
ret = vfio_cap_init(vdev);

0 commit comments

Comments
 (0)