Re: [Xen-devel] [RFC 07/14] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=y

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Mon, 2014-03-17 at 07:22 +0000, Jan Beulich wrote:
> >>> On 14.03.14 at 18:23, Ian Campbell <Ian.Campbell@xxxxxxxxxx> wrote:
> > On Thu, 2014-03-13 at 10:26 -0400, Daniel De Graaf wrote:
> >> On 03/12/2014 12:16 PM, Julien Grall wrote:
> > 
> > Julien, Did you mean =n in the subject?
> > 
> >> > The commit f7d29f7b "flask: add compat mode guest support" introduces
> >> > build breakage on ARM when XSM is enabled. It's because ARM doesn't use
> >> > compat mode.
> >> >
> >> > flask_op.c:794:34: fatal error: compat/event_channel.h: No such file or 
> > directory
> >> >   #include <compat/event_channel.h>
> >> >
> >> > Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
> >> > Cc: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
> >> 
> >> Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
> >> 
> >> > ---
> >> >   xen/xsm/flask/flask_op.c |    2 +-
> >> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >> > diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c
> >> > index 3b84679..3eb3a01 100644
> >> > --- a/xen/xsm/flask/flask_op.c
> >> > +++ b/xen/xsm/flask/flask_op.c
> >> > @@ -785,7 +785,7 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) 
> > u_flask_op)
> >> >       return rv;
> >> >   }
> >> >
> >> > -#ifndef COMPAT
> >> > +#if !defined(COMPAT) && defined(CONFIG_COMPAT)
> > 
> > I don't see this construct very much in the existing code. It looks like
> > the common idiom is just #ifdef CONFIG_COMPAT.
> > 
> > Jan, what's the right thing to do here?
> 
> The construct is appropriate here (albeit I'd switch the operands
> of &&) - elsewhere inclusion goes indirectly, with the two checks
> in distinct places. It didn't seem worthwhile introducing a separate
> file here for the compat mode wrapping, so the check can validly
> be done in a single conditional.

Makes sense, thanks.

Ian.



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