[Xen-ia64-devel] [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de (Re: [Xen-devel] [IA64] Weekly benchmark results [2010ww36])

["KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx>]

Hi Ian,

>>>>> On Fri, 10 Sep 2010 18:51:23 +0100
>>>>> Ian.Jackson@xxxxxxxxxxxxx(Ian Jackson)  said:
> 
> KUWAMURA Shin'ya writes ("[Xen-devel] [IA64] Weekly benchmark results 
> [2010ww36]"):
> > - Linux-2.6.18-xen cannot be built:
> >     In file included from 
> > /linux-2.6.18-xen.hg/arch/ia64/xen/xcom_privcmd.c:27:
> >     /linux-2.6.18-xen.hg/include/xen/interface/domctl.h:284: error: field 
> > `cpumap' has incomplete type
> >   This issue was fixed ad hoc.
> 
> If you'd like to send the ad-hoc fixes you used, that would be very
> helpful.  If they're suitable for inclusion we'll commit them, and if
> not they'll be good explanations of the bugs.

Thank you for your advice.
I attached the patch. The cause is as follows:

1028:6f7bda25a4de includes xen-unstable 21568:05bfc5a472b which
moved struct xenctl_cpumap from domctl.h to xen.h.
However, xcom_privcmd.c includes xen.h without __XEN__ or
__XEN_TOOLS__, so struct xenctl_cpumap is invisible from
xcom_privcmd.c.

This patch fixes by defining __XEN_TOOLS__ at the top of xcom_privcmd.c.
But this causes a warning:

In file included from /linux-2.6.18-xen.hg/include/xen/interface/xen.h:30,
                 from /linux-2.6.18-xen.hg/include/xen/interface/arch-ia64.h:26,
                 from include2/asm/xen/privop.h:16,
                 from include2/asm/privop.h:14,
                 from include2/asm/intrinsics.h:189,
                 from include2/asm/bitops.h:14,
                 from /linux-2.6.18-xen.hg/include/linux/bitops.h:9,
                 from /linux-2.6.18-xen.hg/include/linux/kernel.h:15,
                 from /linux-2.6.18-xen.hg/arch/ia64/xen/xcom_privcmd.c:22:
/linux-2.6.18-xen.hg/include/xen/interface/xen-compat.h:34:1: warning: 
"__XEN_INTERFACE_VERSION__" redefined
<command line>:5:1: warning: this is the location of the previous definition

Best regards,
-- 
  KUWAMURA Shin'ya

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1284363596 -32400
# Node ID c92a45a06e995eadd874957fc9e857c7c169fc0a
# Parent  9b1adfb8b0b3b37c13f06c0adb8dd17b2a0a077d
ia64, xencomm: fix 1028:6f7bda25a4de

This patch fixes the following errors in linux-2.6.18-xen.hg:
  In file included from /linux-2.6.18-xen.hg/arch/ia64/xen/xcom_privcmd.c:27:
  /linux-2.6.18-xen.hg/include/xen/interface/domctl.h:284: error: field 
'cpumap' has incomplete type
  In file included from /linux-2.6.18-xen.hg/arch/ia64/xen/xcom_privcmd.c:28:
  /linux-2.6.18-xen.hg/include/xen/interface/sysctl.h:74: error: field 
'cpu_mask' has incomplete type
  /linux-2.6.18-xen.hg/include/xen/interface/sysctl.h:540: error: field 
'cpumap' has incomplete type

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>

diff -r 9b1adfb8b0b3 -r c92a45a06e99 arch/ia64/xen/xcom_privcmd.c
--- a/arch/ia64/xen/xcom_privcmd.c      Thu Aug 26 11:27:25 2010 +0100
+++ b/arch/ia64/xen/xcom_privcmd.c      Mon Sep 13 16:39:56 2010 +0900
@@ -16,6 +16,7 @@
  * Authors: Hollis Blanchard <hollisb@xxxxxxxxxx>
  *          Tristan Gingold <tristan.gingold@xxxxxxxx>
  */
+#define __XEN_TOOLS__
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel