# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1216905538 -3600
# Node ID 0c320ae06d79d319f9fd419428e1539bc1b4818d
# Parent 89d05940cc1cac7c2d69a25a2b205222bc6e6234
tools: remove type parameter from xc_physdev_map_pirq{,_msi}()
... as it's implied by the function name.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
tools/ioemu/hw/pass-through.c | 3 +--
tools/ioemu/hw/pt-msi.c | 6 ++----
tools/libxc/xc_physdev.c | 6 ++----
tools/libxc/xenctrl.h | 2 --
tools/python/xen/lowlevel/xc/xc.c | 3 +--
5 files changed, 6 insertions(+), 14 deletions(-)
diff -r 89d05940cc1c -r 0c320ae06d79 tools/ioemu/hw/pass-through.c
--- a/tools/ioemu/hw/pass-through.c Thu Jul 24 14:18:05 2008 +0100
+++ b/tools/ioemu/hw/pass-through.c Thu Jul 24 14:18:58 2008 +0100
@@ -2785,8 +2785,7 @@ struct pt_dev * register_real_device(PCI
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 -r 89d05940cc1c -r 0c320ae06d79 tools/ioemu/hw/pt-msi.c
--- a/tools/ioemu/hw/pt-msi.c Thu Jul 24 14:18:05 2008 +0100
+++ b/tools/ioemu/hw/pt-msi.c Thu Jul 24 14:18:58 2008 +0100
@@ -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_
/* 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 -r 89d05940cc1c -r 0c320ae06d79 tools/libxc/xc_physdev.c
--- a/tools/libxc/xc_physdev.c Thu Jul 24 14:18:05 2008 +0100
+++ b/tools/libxc/xc_physdev.c Thu Jul 24 14:18:58 2008 +0100
@@ -22,7 +22,6 @@ int xc_physdev_pci_access_modify(int xc_
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_handl
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 -r 89d05940cc1c -r 0c320ae06d79 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Thu Jul 24 14:18:05 2008 +0100
+++ b/tools/libxc/xenctrl.h Thu Jul 24 14:18:58 2008 +0100
@@ -907,13 +907,11 @@ int xc_gnttab_set_max_grants(int xcg_han
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 -r 89d05940cc1c -r 0c320ae06d79 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Thu Jul 24 14:18:05 2008 +0100
+++ b/tools/python/xen/lowlevel/xc/xc.c Thu Jul 24 14:18:58 2008 +0100
@@ -958,8 +958,7 @@ static PyObject *pyxc_physdev_map_pirq(P
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);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home