Re: [PATCH RESEND v9 07/14] xen/common: add ARM stub for the function memory_type_changed()

[Julien Grall <julien.grall@linaro.org>]

Hi Arianna,

On 07/14/2014 01:50 AM, Arianna Avanzini wrote:
> MTRR-related code is not available for the ARM architecture. Given
> that the memory_type_changed() function would be called also from
> common code, its invocation is currently ifdef'd out to be only
> compiled in on an x86 machine. This commit adds an empty stub for ARM.
> 
> Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
Acked-by: Julien Grall <julien.grall@linaro.org>

Regards,

> Cc: Dario Faggioli <dario.faggioli@citrix.com>
> Cc: Paolo Valente <paolo.valente@unimore.it>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Julien Grall <julien.grall@citrix.com>
> Cc: Ian Campbell <Ian.Campbell@eu.citrix.com>
> Cc: Jan Beulich <JBeulich@suse.com>
> Cc: Keir Fraser <keir@xen.org>
> Cc: Tim Deegan <tim@xen.org>
> Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Eric Trudeau <etrudeau@broadcom.com>
> Cc: Viktor Kleinik <viktor.kleinik@globallogic.com>
> 
> ---
> 
>     v9:
>         - Don't expose the memory_type_changed() function to common code,
>           just add an empty stub in arch/arm/p2m.c and in the related header
>           for ARM.
> 
> ---
>  xen/arch/arm/p2m.c        | 4 ++++
>  xen/common/domctl.c       | 2 --
>  xen/include/asm-arm/p2m.h | 2 ++
>  3 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
> index e9f7c96..6add407 100644
> --- a/xen/arch/arm/p2m.c
> +++ b/xen/arch/arm/p2m.c
> @@ -47,6 +47,10 @@ void p2m_dump_info(struct domain *d)
>      spin_unlock(&p2m->lock);
>  }
>  
> +void memory_type_changed(struct domain *d)
> +{
> +}
> +
>  void dump_p2m_lookup(struct domain *d, paddr_t addr)
>  {
>      struct p2m_domain *p2m = &d->arch.p2m;
> diff --git a/xen/common/domctl.c b/xen/common/domctl.c
> index c326aba..24102c0 100644
> --- a/xen/common/domctl.c
> +++ b/xen/common/domctl.c
> @@ -897,10 +897,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
>              ret = iomem_permit_access(d, mfn, mfn + nr_mfns - 1);
>          else
>              ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1);
> -#ifdef CONFIG_X86
>          if ( !ret )
>              memory_type_changed(d);
> -#endif
>      }
>      break;
>  
> diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h
> index 06c93a0..13fea36 100644
> --- a/xen/include/asm-arm/p2m.h
> +++ b/xen/include/asm-arm/p2m.h
> @@ -5,6 +5,8 @@
>  
>  struct domain;
>  
> +extern void memory_type_changed(struct domain *);
> +
>  /* Per-p2m-table state */
>  struct p2m_domain {
>      /* Lock that protects updates to the p2m */
> 


-- 
Julien Grall