[Xen-changelog] [qemu-xen-unstable] pass-through: pt_reset_interrupt_and_io_mapping(): use hw INTX

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

commit 42d8fbbadac97d49d7b28a18c58be26df290c7d7
Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date:   Mon Jul 20 12:26:39 2009 +0100

    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 <horms@xxxxxxxxxxxx>
---
 hw/pass-through.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/pass-through.c b/hw/pass-through.c
index 5062b31..c1a9b42 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,
--
generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog