3 files changed, 10 insertions, 32 deletions

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 15fd981d35f1..ffd8c7a2cdbb 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -106,7 +106,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                         dev_dbg(&dev->dev,
                                 "xen: msi already bound to pirq=%d\n", pirq);
                 }
-                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq,
+                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq, 0,
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "msi-x" : "msi");
                 if (irq < 0)
@@ -145,7 +145,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 goto error;
         i = 0;
         list_for_each_entry(msidesc, &dev->msi_list, list) {
-                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i],
+                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i], 0,
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "pcifront-msi-x" :
                                                "pcifront-msi");
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 77ede77a9ee9..34469489087b 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -662,7 +662,7 @@ int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc)
 }
 
 int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
-                             int pirq, const char *name)
+                             int pirq, int vector, const char *name)
 {
         int irq, ret;
 
@@ -675,7 +675,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
         set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
                                       handle_level_irq, name);
 
-        irq_info[irq] = mk_pirq_info(0, pirq, 0, 0);
+        irq_info[irq] = mk_pirq_info(0, pirq, 0, vector);
         pirq_to_irq[pirq] = irq;
         ret = set_irq_msi(irq, msidesc);
         if (ret < 0)
@@ -691,7 +691,6 @@ error_irq:
 
 int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type)
 {
-        int ret, irq = -1;
         struct physdev_map_pirq map_irq;
         int rc;
         int pos;
@@ -719,34 +718,13 @@ int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type)
         rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
         if (rc) {
                 dev_warn(&dev->dev, "xen map irq failed %d\n", rc);
-                goto out;
+                return -1;
         }
 
-        spin_lock(&irq_mapping_update_lock);
-
-        irq = xen_allocate_irq_dynamic();
-
-        if (irq == -1)
-                goto out;
-
-        irq_info[irq] = mk_pirq_info(0, map_irq.pirq, 0, map_irq.index);
-        pirq_to_irq[map_irq.pirq] = irq;
-
-        set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
-                        handle_level_irq,
-                        (type == PCI_CAP_ID_MSIX) ? "msi-x":"msi");
-
-        ret = set_irq_msi(irq, msidesc);
-        if (ret)
-                goto out_irq;
-
-out:
-        spin_unlock(&irq_mapping_update_lock);
-        return irq;
-out_irq:
-        spin_unlock(&irq_mapping_update_lock);
-        xen_free_irq(irq);
-        return -1;
+        return xen_bind_pirq_msi_to_irq(dev, msidesc,
+                                        map_irq.pirq, map_irq.index,
+                                        (type == PCI_CAP_ID_MSIX) ?
+                                        "msi-x" : "msi");
 }
 #endif
 
diff --git a/include/xen/events.h b/include/xen/events.h
index 18bf825bac66..45c08a0d580a 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -77,7 +77,7 @@ int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name);
 #ifdef CONFIG_PCI_MSI
 int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc);
 int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
-                             int pirq, const char *name);
+                             int pirq, int vector, const char *name);
 int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type);
 #endif