Re: [Xen-devel] [PATCH RFC v2 11/12] xen/arm: Enable the compilation of mem_access and mem_event on ARM.

[Tamas K Lengyel <tamas.lengyel@xxxxxxxxxxxx>]

On Thu, Aug 28, 2014 at 10:54 AM, Jan Beulich <JBeulich@xxxxxxxx> wrote:

>>> On 28.08.14 at 10:42, <tamas.lengyel@xxxxxxxxxxxx> wrote:
> On Thu, Aug 28, 2014 at 8:39 AM, Jan Beulich <JBeulich@xxxxxxxx> wrote:
>
>> >>> On 27.08.14 at 19:12, <tamas.lengyel@xxxxxxxxxxxx> wrote:
>> > On Wed, Aug 27, 2014 at 5:24 PM, Jan Beulich <JBeulich@xxxxxxxx> wrote:
>> >
>> >> >>> On 27.08.14 at 16:06, <tklengyel@xxxxxxxxxxxxx> wrote:
>> >> > --- a/xen/common/mem_event.c
>> >> > +++ b/xen/common/mem_event.c
>> >> > @@ -20,16 +20,22 @@
>> >> >   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
>> >> 02111-1307  USA
>> >> >   */
>> >> >
>> >> > -#ifdef CONFIG_X86
>> >> > -
>> >> > +#include <xen/sched.h>
>> >> >  #include <asm/domain.h>
>> >> >  #include <xen/event.h>
>> >> >  #include <xen/wait.h>
>> >> >  #include <asm/p2m.h>
>> >> >  #include <xen/mem_event.h>
>> >> >  #include <xen/mem_access.h>
>> >>
>> >> This already is quite a mishmash of asm/ and xen/ includes - please
>> >> don't make it even worse.
>> >>
>> >
>> > Adding xen/sched.h is required here unfortunately as without it the
>> > compilation breaks on ARM:
>> >
>> > In file included from
>> > /home/odroid/workspace/xen/xen/include/asm/domain.h:6:0,
>> >                  from mem_event.c:23:
>> > /home/odroid/workspace/xen/xen/include/xen/sched.h:251:22: error: field
>> > 'arch' has incomplete type
>> >      struct arch_vcpu arch;
>> >                       ^
>> > /home/odroid/workspace/xen/xen/include/xen/sched.h:405:24: error: field
>> > 'arch' has incomplete type
>> >      struct arch_domain arch;
>> >                         ^
>> > make[4]: *** [mem_event.o] Error 1
>> >
>> > I can put that include into a #ifdef CONFIG_ARM if that helps.
>>
>> My point wasn't the addition of the include, just the place where
>> you put it among the already present ones.
>

> I see, I did need to include it before asm/domain.h or the above compile
> time error is triggered.

So in the end this shows that ARM including xen/sched.h from its
asm/domain.h is bogus - this just can't work. I.e. a first step would
be to clean that up. Furthermore I'm sure you would achieve a
working build even if you simply replaced the inclusion of
asm/domain.h with that of xen/sched.h (including the former from
other than xen/domain.h or arch-specific code is suspicious anyway,
i.e. should be taken care of properly in the course of making the
source file common).

Jan

You are right, including asm/domain.h is not needed any longer, it compiles fine without it.

Tamas

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel