Jan Beulich
2008-Jul-24 12:43 UTC
[Xen-devel] [PATCH] tools: remove type parameter from xc_physdev_map_pirq{,_msi}()
.. as it''s implied by the function name. While the patch touches the deprecated ioemu sub-tree, I''m unsure in what shape to submit patches againt the new qemu tree, so ideally the respective parts would just be taken from this patch and also applied to that tree. Signed-off-by: Jan Beulich <jbeulich@novell.com> Index: 2008-07-21/tools/ioemu/hw/pass-through.c ==================================================================--- 2008-07-21.orig/tools/ioemu/hw/pass-through.c 2008-07-18 16:19:33.000000000 +0200 +++ 2008-07-21/tools/ioemu/hw/pass-through.c 2008-07-24 11:51:44.000000000 +0200 @@ -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 ) { Index: 2008-07-21/tools/ioemu/hw/pt-msi.c ==================================================================--- 2008-07-21.orig/tools/ioemu/hw/pt-msi.c 2008-07-18 16:19:33.000000000 +0200 +++ 2008-07-21/tools/ioemu/hw/pt-msi.c 2008-07-24 11:52:34.000000000 +0200 @@ -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 ) Index: 2008-07-21/tools/libxc/xc_physdev.c ==================================================================--- 2008-07-21.orig/tools/libxc/xc_physdev.c 2008-05-13 11:02:22.000000000 +0200 +++ 2008-07-21/tools/libxc/xc_physdev.c 2008-07-24 11:50:46.000000000 +0200 @@ -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; Index: 2008-07-21/tools/libxc/xenctrl.h ==================================================================--- 2008-07-21.orig/tools/libxc/xenctrl.h 2008-07-18 16:19:34.000000000 +0200 +++ 2008-07-21/tools/libxc/xenctrl.h 2008-07-24 11:51:02.000000000 +0200 @@ -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, Index: 2008-07-21/tools/python/xen/lowlevel/xc/xc.c ==================================================================--- 2008-07-21.orig/tools/python/xen/lowlevel/xc/xc.c 2008-07-18 16:19:34.000000000 +0200 +++ 2008-07-21/tools/python/xen/lowlevel/xc/xc.c 2008-07-24 11:53:02.000000000 +0200 @@ -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-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2008-Jul-24 13:42 UTC
Re: [Xen-devel] [PATCH] tools: remove type parameter from xc_physdev_map_pirq{,_msi}()
Jan Beulich writes ("[Xen-devel] [PATCH] tools: remove type parameter from xc_physdev_map_pirq{,_msi}()"):> While the patch touches the deprecated ioemu sub-tree, I''m unsure in > what shape to submit patches againt the new qemu tree, so ideally the > respective parts would just be taken from this patch and also applied > to that tree.I''ve done that. It''s fine to just put a note in your message, like you just did, to ask for your change to go into the qemu tree too. If it turns out not to fit then I''ll fix it up or let you know. (It would also be nice if people who patches to ioemu which are _not_ supposed to go into ioemu-remote mentioned that this was the case.) Thanks, Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jonkery Huang
2008-Aug-12 08:07 UTC
Re: [Xen-devel] [PATCH] tools: remove type parameter from xc_physdev_map_pirq{, _msi}()
Hi, When build the latest xen-unstable(c/s 18311), run into a compilation error: make[4]: Entering directory `/root/xen-unstable.hg/tools/ioemu-remote/i386-dm'' gcc -I. -I.. -I/root/xen-unstable.hg/tools/ioemu-dir/target-i386 -I/root/xen-unstable.hg/tools/ioemu-dir -MMD -MP -DNEED_CPU_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -I/root/xen-unstable.hg/tools/ioemu-dir/tcg -I/root/xen-unstable.hg/tools/ioemu-dir/tcg/i386 -I/root/xen-unstable.hg/tools/ioemu-dir/fpu -DHAS_AUDIO -DHAS_AUDIO -I/root/xen-unstable.hg/tools/..//tools/libxc -I/root/xen-unstable.hg/tools/..//tools/xenstore -I/root/xen-unstable.hg/tools/..//tools/include -I/root/xen-unstable.hg/tools/..//tools/blktap/lib -Wall -O2 -g -fno-strict-aliasing -O2 -fomit-frame-pointer -m32 -march=i686 -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wno-unused-value -Wdeclaration-after-statement -D__XEN_TOOLS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -mno-tls-direct-seg-refs -Wno-unused -Wno-declaration-after-statement -Wno-pointer-sign -DCONFIG_PASSTHROUGH -I../hw -m32 -DUSE_SSE2=1 -msse2 -Wno-unused -Wno-declaration-after-statement -Wno-pointer-sign -DCONFIG_PASSTHROUGH -c -o pass-through.o /root/xen-unstable.hg/tools/ioemu-dir/hw/pass-through.c /root/xen-unstable.hg/tools/ioemu-dir/hw/pass-through.c: In function ‘register_real_device’: /root/xen-unstable.hg/tools/ioemu-dir/hw/pass-through.c:2826: warning: passing argument 4 of ‘xc_physdev_map_pirq’ makes integer from pointer without a cast /root/xen-unstable.hg/tools/ioemu-dir/hw/pass-through.c:2826: error: too few arguments to function ‘xc_physdev_map_pirq’ make[4]: *** [pass-through.o] Error 1 make[4]: Leaving directory `/root/xen-unstable.hg/tools/ioemu-remote/i386-dm'' make[3]: *** [subdir-i386-dm] Error 2 make[3]: Leaving directory `/root/xen-unstable.hg/tools/ioemu-remote'' make[2]: *** [subdir-install-ioemu-dir] Error 2 make[2]: Leaving directory `/root/xen-unstable.hg/tools'' make[1]: *** [subdirs-install] Error 2 make[1]: Leaving directory `/root/xen-unstable.hg/tools'' make: *** [install-tools] Error 2 Jan Beulich wrote:> .. as it''s implied by the function name. > > While the patch touches the deprecated ioemu sub-tree, I''m unsure in > what shape to submit patches againt the new qemu tree, so ideally the > respective parts would just be taken from this patch and also applied > to that tree. > > Signed-off-by: Jan Beulich <jbeulich@novell.com> > > Index: 2008-07-21/tools/ioemu/hw/pass-through.c > ==================================================================> --- 2008-07-21.orig/tools/ioemu/hw/pass-through.c 2008-07-18 16:19:33.000000000 +0200 > +++ 2008-07-21/tools/ioemu/hw/pass-through.c 2008-07-24 11:51:44.000000000 +0200 > @@ -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 ) > { > Index: 2008-07-21/tools/ioemu/hw/pt-msi.c > ==================================================================> --- 2008-07-21.orig/tools/ioemu/hw/pt-msi.c 2008-07-18 16:19:33.000000000 +0200 > +++ 2008-07-21/tools/ioemu/hw/pt-msi.c 2008-07-24 11:52:34.000000000 +0200 > @@ -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 ) > Index: 2008-07-21/tools/libxc/xc_physdev.c > ==================================================================> --- 2008-07-21.orig/tools/libxc/xc_physdev.c 2008-05-13 11:02:22.000000000 +0200 > +++ 2008-07-21/tools/libxc/xc_physdev.c 2008-07-24 11:50:46.000000000 +0200 > @@ -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; > Index: 2008-07-21/tools/libxc/xenctrl.h > ==================================================================> --- 2008-07-21.orig/tools/libxc/xenctrl.h 2008-07-18 16:19:34.000000000 +0200 > +++ 2008-07-21/tools/libxc/xenctrl.h 2008-07-24 11:51:02.000000000 +0200 > @@ -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, > Index: 2008-07-21/tools/python/xen/lowlevel/xc/xc.c > ==================================================================> --- 2008-07-21.orig/tools/python/xen/lowlevel/xc/xc.c 2008-07-18 16:19:34.000000000 +0200 > +++ 2008-07-21/tools/python/xen/lowlevel/xc/xc.c 2008-07-24 11:53:02.000000000 +0200 > @@ -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-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel > >-- Thanks, J _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2008-Aug-12 08:37 UTC
Re: [Xen-devel] [PATCH] tools: remove type parameter from xc_physdev_map_pirq{, _msi}()
On 12/8/08 09:07, "Jonkery Huang" <jonkery.huang@oracle.com> wrote:> Hi, > > When build the latest xen-unstable(c/s 18311), run into a compilation error: > make[4]: Entering directoryIt looks to me like you don''t have latest xen-unstable checked out. The error looks like qemu-xen-unstable is trying to use a 4-argument form of xc_physdev_map_pirq(), which is the new form. The prototype in xenctrl.h in your xen-unstable is therefore probably out of date. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jonkery Huang
2008-Aug-12 08:51 UTC
Re: [Xen-devel] [PATCH] tools: remove type parameter from xc_physdev_map_pirq{, _msi}()
I always use "hg pull" to update which may cause this issue. Keir Fraser wrote:> On 12/8/08 09:07, "Jonkery Huang" <jonkery.huang@oracle.com> wrote: > > >> Hi, >> >> When build the latest xen-unstable(c/s 18311), run into a compilation error: >> make[4]: Entering directory >> > > It looks to me like you don''t have latest xen-unstable checked out. The > error looks like qemu-xen-unstable is trying to use a 4-argument form of > xc_physdev_map_pirq(), which is the new form. The prototype in xenctrl.h in > your xen-unstable is therefore probably out of date. > > -- Keir > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel >-- Thanks, J _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2008-Aug-12 08:57 UTC
Re: [Xen-devel] [PATCH] tools: remove type parameter from xc_physdev_map_pirq{, _msi}()
You should use "hg pull -u". On 12/8/08 09:51, "Jonkery Huang" <jonkery.huang@oracle.com> wrote:> I always use "hg pull" to update which may cause this issue. > > Keir Fraser wrote: >> On 12/8/08 09:07, "Jonkery Huang" <jonkery.huang@oracle.com> wrote: >> >> >>> Hi, >>> >>> When build the latest xen-unstable(c/s 18311), run into a compilation error: >>> make[4]: Entering directory >>> >> >> It looks to me like you don''t have latest xen-unstable checked out. The >> error looks like qemu-xen-unstable is trying to use a 4-argument form of >> xc_physdev_map_pirq(), which is the new form. The prototype in xenctrl.h in >> your xen-unstable is therefore probably out of date. >> >> -- Keir >> >> >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xensource.com >> http://lists.xensource.com/xen-devel >>_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel