Re: [Xen-devel] [PATCH RFC 16/55] x86/mm: switch to new APIs in map_pages_to_xen

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Thu, Feb 07, 2019 at 04:44:17PM +0000, Wei Liu wrote:
> Page tables allocated in that function should be mapped and unmapped
> now.
> 
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
>  xen/arch/x86/mm.c | 31 ++++++++++++++++++++++---------
>  1 file changed, 22 insertions(+), 9 deletions(-)
> 

Gitlab CI has discovered ...

> diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
> index 356d561a06..c4cb6fbb60 100644
> --- a/xen/arch/x86/mm.c
> +++ b/xen/arch/x86/mm.c
> @@ -5058,6 +5058,7 @@ int map_pages_to_xen(
>              unsigned int flush_flags =
>                  FLUSH_TLB | FLUSH_ORDER(2 * PAGETABLE_ORDER);
>              l2_pgentry_t *l2t;
> +            mfn_t mfn;

this and ...

>          pl2e = virt_to_xen_l2e(virt);
> @@ -5171,6 +5177,7 @@ int map_pages_to_xen(
>                  unsigned int flush_flags =
>                      FLUSH_TLB | FLUSH_ORDER(PAGETABLE_ORDER);
>                  l1_pgentry_t *l1t;
> +                mfn_t mfn;

... this shadowed the mfn variable from outer scope. I have fixed these
two issues in my local branch by turning them into l2t_mfn and l1t_mfn
respectively.

Interestingly my local build environment didn't complain and Xen worked
fine (presumably due to this particular path was never hit).

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel