Re: [PATCH 05/12] xen: don't include asm/hypercall.h from C sources

[Juergen Gross <jgross@xxxxxxxx>]

On 18.10.21 14:39, Jan Beulich wrote:
> On 15.10.2021 14:51, Juergen Gross wrote:
> > --- a/xen/arch/x86/x86_64/mm.c
> > +++ b/xen/arch/x86/x86_64/mm.c
> > @@ -32,7 +32,6 @@ EMIT_FILE;
> >   #include <asm/page.h>
> >   #include <asm/flushtlb.h>
> >   #include <asm/fixmap.h>
> > -#include <asm/hypercall.h>
> >   #include <asm/msr.h>
> >   #include <asm/pv/domain.h>
> >   #include <asm/setup.h>
> Afaict xen/hypercall.h also doesn't need including here. But I can
> agree that this is at best a partly related change.
Will check and delete it in case not needed.

> > --- a/xen/arch/x86/x86_64/platform_hypercall.c
> > +++ b/xen/arch/x86/x86_64/platform_hypercall.c
> > @@ -41,8 +41,8 @@ CHECK_pf_resource_entry;
> >   #undef xen_pf_resource_entry
> >   
> >   #define COMPAT
> > -#define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t)
> > -#define _XEN_GUEST_HANDLE_PARAM(t) XEN_GUEST_HANDLE_PARAM(t)
> > +#undef guest_handle_okay
> > +#define guest_handle_okay          compat_handle_okay
> Is this a change that slipped in here from patch 3, accompanying
>
> -#define do_platform_op(x)   compat_platform_op(_##x)
> +#define do_platform_op(x)   compat_platform_op(x)
>
> there? Or does that change belong here? I have to admit anyway that
> it's not entirely clear to me why this adjustment needs making.
Oh yes, this is a leftover to make things work with prototypes being
made seen in platform_hypercall.c.

> > --- a/xen/common/compat/grant_table.c
> > +++ b/xen/common/compat/grant_table.c
> > @@ -4,6 +4,7 @@
> >    */
> >   
> >   #include <compat/grant_table.h>
> > +#include <xen/hypercall.h>
> Nit: Generally compat/*.h go last.
Okay.


Juergen

Attachment: OpenPGP_0xB0DE9DD628BF132F.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature
Description: OpenPGP digital signature