Mailing List Archive: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de (Re: [IA64] Weekly benchmark results [2010ww36])

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

Sep 13, 2010, 1:07 AM

Post #1 of 5 (757 views)

Hi Ian,

>>>>> On Fri, 10 Sep 2010 18:51:23 +0100
>>>>> Ian.Jackson@eu.citrix.com(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

[PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de (Re: [IA64] Weekly benchmark results [2010ww36]) [ In reply to ]

JBeulich at novell

Sep 13, 2010, 1:38 AM

Post #2 of 5 (737 views)

Permalink

>>> On 13.09.10 at 10:07, "KUWAMURA Shin'ya" <kuwa@jp.fujitsu.com> wrote:
> Hi Ian,
>
>>>>>> On Fri, 10 Sep 2010 18:51:23 +0100
>>>>>> Ian.Jackson@eu.citrix.com(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

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)?

Jan

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

Re: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de [ In reply to ]

kuwa at jp

Sep 14, 2010, 12:39 AM

Post #3 of 5 (744 views)

Permalink

Hi Jan,

>>>>> On Mon, 13 Sep 2010 09:38:50 +0100
>>>>> JBeulich@novell.com("Jan Beulich") said:
>
> >>> On 13.09.10 at 10:07, "KUWAMURA Shin'ya" <kuwa@jp.fujitsu.com> 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@jp.fujitsu.com>

Best regards,
--
KUWAMURA Shin'ya

Re: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de [ In reply to ]

Ian.Jackson at eu

Sep 16, 2010, 10:08 AM

Post #4 of 5 (733 views)

Permalink

KUWAMURA Shin'ya writes ("[Xen-devel] Re: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de"):
> On Mon, 13 Sep 2010 09:38:50 +0100
> JBeulich@novell.com("Jan Beulich") said:
> > 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)?

Jan's suggestion seems sensible.

> Thank you for your advice.
>
> I fixed this warning by adding an #include line. I attached the patch.
...
> +#include <xen/interface/xen-compat.h>
> +#define __XEN_TOOLS__

Why do you choose to #define __XEN_TOOLS__ rather than __XEN__ (which
latter is already defined in this file, as Jan notes) ?

Does moving the definition of __XEN__ further up cause other problems ?

Ian.

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

Re: Re: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de [ In reply to ]

kuwa at jp

Sep 16, 2010, 6:17 PM

Post #5 of 5 (729 views)

Permalink

Hi Ian,

>>>>> On Thu, 16 Sep 2010 18:08:12 +0100
>>>>> Ian.Jackson@eu.citrix.com(Ian Jackson) said:
>
> KUWAMURA Shin'ya writes ("[Xen-devel] Re: [PATCH] [Linux] ia64, xencomm: fix 1028:6f7bda25a4de"):
> > I fixed this warning by adding an #include line. I attached the patch.
> ...
> > +#include <xen/interface/xen-compat.h>
> > +#define __XEN_TOOLS__
>
> Why do you choose to #define __XEN_TOOLS__ rather than __XEN__ (which
> latter is already defined in this file, as Jan notes) ?
> Does moving the definition of __XEN__ further up cause other problems ?

__XEN__ causes the following compilation error:

In file included from include2/asm/page.h:236,
from include2/asm/ptrace.h:234,
from include2/asm/processor.h:19,
from include2/asm/thread_info.h:11,
from /linux-2.6.18-xen.hg/include/linux/thread_info.h:21,
from /linux-2.6.18-xen.hg/include/linux/preempt.h:9,
from /linux-2.6.18-xen.hg/include/linux/spinlock.h:49,
from /linux-2.6.18-xen.hg/include/linux/mmzone.h:7,
from /linux-2.6.18-xen.hg/include/linux/gfp.h:4,
from /linux-2.6.18-xen.hg/arch/ia64/xen/xcom_privcmd.c:23:
include2/asm/hypervisor.h:63: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token

The line of the problem is as follows:
extern shared_info_t *HYPERVISOR_shared_info;

The identifier `shared_info_t' is defined in include/xen/interface/xen.h
if __XEN__ is NOT defined:

include/xen/interface/xen.h:
#ifndef __XEN__
typedef struct shared_info shared_info_t;
#endif

Best regards,
--
KUWAMURA Shin'ya

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

Mailing List Archive

Attached Files:

Attached Files: