[Xen-devel] [PATCH] ioemu-remote: Fix compilation error caused by cs 18128

[Jean Guyader <jean.guyader@xxxxxxxxxxxxx>]

ioemu-remote: Type argument has been removed from xc_physdev_map_pirq{,_msi}()

Signed-off-by: Jean Guyader <jean.guyader@xxxxxxxxxxxxx>

--
Jean Guyader

diff --git a/hw/pass-through.c b/hw/pass-through.c
index 1bddbd5..3ff0923 100644
--- a/hw/pass-through.c
+++ b/hw/pass-through.c
@@ -571,8 +569,7 @@ struct pt_dev * register_real_device(PCIBus *e_bus,
         int pirq = pci_dev->irq;
 
         machine_irq = pci_dev->irq;
-        rc = xc_physdev_map_pirq(xc_handle, domid, MAP_PIRQ_TYPE_GSI,
-                                machine_irq, &pirq);
+        rc = xc_physdev_map_pirq(xc_handle, domid, machine_irq, &pirq);
 
         if ( rc )
         {
diff --git a/hw/pt-msi.c b/hw/pt-msi.c
index d5bd6b7..951cd4b 100644
--- a/hw/pt-msi.c
+++ b/hw/pt-msi.c
@@ -86,10 +86,9 @@ static int pt_msi_setup(struct pt_dev *dev)
         return -1;
     }
 
-    if ( xc_physdev_map_pirq_msi(xc_handle, domid, MAP_PIRQ_TYPE_MSI,
-                            AUTO_ASSIGN, &pirq,
-                                                       dev->pci_dev->dev << 3 
| dev->pci_dev->func,
-                                                       dev->pci_dev->bus, 0, 
1) )
+    if ( xc_physdev_map_pirq_msi(xc_handle, domid, AUTO_ASSIGN, &pirq,
+                                 dev->pci_dev->dev << 3 | dev->pci_dev->func,
+                                 dev->pci_dev->bus, 0, 1) )
     {
         PT_LOG("error map msi\n");
         return -1;
@@ -511,10 +510,9 @@ static int pt_msix_update_one(struct pt_dev *dev, int 
entry_nr)
     /* Check if this entry is already mapped */
     if ( entry->pirq == -1 )
     {
-        ret = xc_physdev_map_pirq_msi(xc_handle, domid, MAP_PIRQ_TYPE_MSI,
-                                AUTO_ASSIGN, &pirq,
-                                dev->pci_dev->dev << 3 | dev->pci_dev->func,
-                                dev->pci_dev->bus, entry_nr, 0);
+        ret = xc_physdev_map_pirq_msi(xc_handle, domid, AUTO_ASSIGN, &pirq,
+                                      dev->pci_dev->dev << 3 | 
dev->pci_dev->func,
+                                      dev->pci_dev->bus, entry_nr, 0);
         if ( ret )
         {
             PT_LOG("error map msix entry %x\n", entry_nr);

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