diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-07-24 14:18:58 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-07-24 14:18:58 +0100 |
commit | 6f79893756dd778aea1fb8c42efa4b4832da5d7a (patch) | |
tree | 3a8662ef69116b5d70f3ce86c5cd087979542444 | |
parent | 26b4c342ea857c2f6831ceb6e2bacb6064d82c1f (diff) | |
download | xen-6f79893756dd778aea1fb8c42efa4b4832da5d7a.tar.gz xen-6f79893756dd778aea1fb8c42efa4b4832da5d7a.tar.bz2 xen-6f79893756dd778aea1fb8c42efa4b4832da5d7a.zip |
tools: remove type parameter from xc_physdev_map_pirq{,_msi}()
... as it's implied by the function name.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
-rw-r--r-- | tools/ioemu/hw/pass-through.c | 3 | ||||
-rw-r--r-- | tools/ioemu/hw/pt-msi.c | 6 | ||||
-rw-r--r-- | tools/libxc/xc_physdev.c | 6 | ||||
-rw-r--r-- | tools/libxc/xenctrl.h | 2 | ||||
-rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 3 |
5 files changed, 6 insertions, 14 deletions
diff --git a/tools/ioemu/hw/pass-through.c b/tools/ioemu/hw/pass-through.c index 0e17af915e..cfd0a7696b 100644 --- a/tools/ioemu/hw/pass-through.c +++ b/tools/ioemu/hw/pass-through.c @@ -2785,8 +2785,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/tools/ioemu/hw/pt-msi.c b/tools/ioemu/hw/pt-msi.c index 1936677335..68a952f059 100644 --- a/tools/ioemu/hw/pt-msi.c +++ b/tools/ioemu/hw/pt-msi.c @@ -37,8 +37,7 @@ 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, + 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) ) { @@ -120,8 +119,7 @@ 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, + 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 ) diff --git a/tools/libxc/xc_physdev.c b/tools/libxc/xc_physdev.c index 2b619664cb..b320f19dc8 100644 --- a/tools/libxc/xc_physdev.c +++ b/tools/libxc/xc_physdev.c @@ -22,7 +22,6 @@ int xc_physdev_pci_access_modify(int xc_handle, int xc_physdev_map_pirq(int xc_handle, int domid, - int type, int index, int *pirq) { @@ -33,7 +32,7 @@ int xc_physdev_map_pirq(int xc_handle, return -EINVAL; map.domid = domid; - map.type = type; + map.type = MAP_PIRQ_TYPE_GSI; map.index = index; map.pirq = *pirq; @@ -47,7 +46,6 @@ int xc_physdev_map_pirq(int xc_handle, int xc_physdev_map_pirq_msi(int xc_handle, int domid, - int type, int index, int *pirq, int devfn, @@ -62,7 +60,7 @@ int xc_physdev_map_pirq_msi(int xc_handle, return -EINVAL; map.domid = domid; - map.type = type; + map.type = MAP_PIRQ_TYPE_MSI; map.index = index; map.pirq = *pirq; map.msi_info.devfn = devfn; diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 2f6aafb0c8..0639d3fd23 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -907,13 +907,11 @@ int xc_gnttab_set_max_grants(int xcg_handle, int xc_physdev_map_pirq(int xc_handle, int domid, - int type, int index, int *pirq); int xc_physdev_map_pirq_msi(int xc_handle, int domid, - int type, int index, int *pirq, int devfn, diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index d45aa85dc7..01e0542c9e 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -958,8 +958,7 @@ static PyObject *pyxc_physdev_map_pirq(PyObject *self, if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iii", kwd_list, &dom, &index, &pirq) ) return NULL; - ret = xc_physdev_map_pirq(xc->xc_handle, dom, MAP_PIRQ_TYPE_GSI, - index, &pirq); + ret = xc_physdev_map_pirq(xc->xc_handle, dom, index, &pirq); if ( ret != 0 ) return pyxc_error_to_exception(); return PyLong_FromUnsignedLong(pirq); |