From: Simon Horman Subject: [patch]: qemu-xen: pass-through: pt_reset_interrupt_and_io_mapping(): use hw INTX Date: Tue, 14 Jul 2009 16:28:51 +1000 Message-ID: <20090714062851.GA32631@verge.net.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org 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 Index: ioemu-remote/hw/pass-through.c =================================================================== --- ioemu-remote.orig/hw/pass-through.c 2009-07-14 16:17:15.000000000 +1000 +++ ioemu-remote/hw/pass-through.c 2009-07-14 16:17:21.000000000 +1000 @@ -2156,9 +2156,8 @@ static void pt_reset_interrupt_and_io_ma 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_dev 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,