From: Ian Jackson Date: Mon, 20 Jul 2009 11:26:39 +0000 (+0100) Subject: pass-through: pt_reset_interrupt_and_io_mapping(): use hw INTX X-Git-Tag: xen-4.0.0-rc1~54 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=42d8fbbadac97d49d7b28a18c58be26df290c7d7;p=qemu-xen-4.3-testing.git pass-through: pt_reset_interrupt_and_io_mapping(): use hw INTX This fixes a few things that I missed in previous patches: * Use the hw INTX rather than INTA in pt_reset_interrupt_and_io_mapping() This is consistent with other uses of pci_intx() * Remove now inaccurate "/* fix virtual interrupt pin to INTA# */" comments * Use PCI_SLOT() Signed-off-by: Simon Horman --- diff --git a/hw/pass-through.c b/hw/pass-through.c index 5062b3196..c1a9b42b6 100644 --- a/hw/pass-through.c +++ b/hw/pass-through.c @@ -2156,9 +2156,8 @@ static void pt_reset_interrupt_and_io_mapping(struct pt_dev *ptdev) uint8_t e_intx = 0; /* unbind INTx */ - e_device = (ptdev->dev.devfn >> 3) & 0x1f; - /* fix virtual interrupt pin to INTA# */ - e_intx = 0; + e_device = PCI_SLOT(ptdev->dev.devfn); + e_intx = pci_intx(ptdev); if (ptdev->msi_trans_en == 0 && ptdev->machine_irq) { @@ -4131,7 +4130,6 @@ static struct pt_dev * register_real_device(PCIBus *e_bus, if (rc < 0 && machine_irq != 0) { e_device = PCI_SLOT(assigned_device->dev.devfn); - /* fix virtual interrupt pin to INTA# */ e_intx = pci_intx(assigned_device); rc = xc_domain_bind_pt_pci_irq(xc_handle, domid, machine_irq, 0,