[Xen-ia64-devel] Re: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de

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

Hi Jan,

>>>>> On Mon, 13 Sep 2010 09:38:50 +0100
>>>>> JBeulich@xxxxxxxxxx("Jan Beulich")  said:
> 
> >>> On 13.09.10 at 10:07, "KUWAMURA Shin'ya" <kuwa@xxxxxxxxxxxxxx> wrote:
> > 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
> This doesn't seem to be the right (or a sufficient) fix then.
> 
> Even more, a few lines down in the same source file __XEN__
> already gets #define-d, so the first choice imo would be to simply
> move that definition up. Or does this cause any *more* problems
> than the warning above (which I think needs to be dealt with
> regardless)?

Thank you for your advice.

I fixed this warning by adding an #include line. I attached the patch.

Because xen-compat.h defines __XEN_INTERFACE_VERSION__ only if __XEN__
or __XEN_TOOLS__ is defined, I added #include xen-compat.h before
#define __XEN_TOOLS__.

I confirmed that dom0 kernel could be built without warnings and
guests could be created.

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

Best regards,
-- 
  KUWAMURA Shin'ya

diff -r 9b1adfb8b0b3 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      Tue Sep 14 16:22:34 2010 +0900
@@ -16,6 +16,8 @@
  * Authors: Hollis Blanchard <hollisb@xxxxxxxxxx>
  *          Tristan Gingold <tristan.gingold@xxxxxxxx>
  */
+#include <xen/interface/xen-compat.h>
+#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