From: Jonkery Huang <jonkery.huang@oracle.com>
To: Jan Beulich <jbeulich@novell.com>
Cc: xen-devel@lists.xensource.com
Subject: Re: [PATCH] tools: remove type parameter from xc_physdev_map_pirq{, _msi}()
Date: Tue, 12 Aug 2008 16:07:25 +0800 [thread overview]
Message-ID: <48A144BD.3000906@oracle.com> (raw)
In-Reply-To: <48889515.76E4.0078.0@novell.com>
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
next prev parent reply other threads:[~2008-08-12 8:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-24 12:43 [PATCH] tools: remove type parameter from xc_physdev_map_pirq{,_msi}() Jan Beulich
2008-07-24 13:42 ` Ian Jackson
2008-08-12 8:07 ` Jonkery Huang [this message]
2008-08-12 8:37 ` [PATCH] tools: remove type parameter from xc_physdev_map_pirq{, _msi}() Keir Fraser
2008-08-12 8:51 ` Jonkery Huang
2008-08-12 8:57 ` Keir Fraser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48A144BD.3000906@oracle.com \
--to=jonkery.huang@oracle.com \
--cc=jbeulich@novell.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.