Re: [Xen-devel] [PATCH 1/3] xen: only expose start_info on architectures which have a PV boot path

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 13.03.13 at 13:45, Ian Campbell <ian.campbell@xxxxxxxxxx> wrote:
> Most of this struct is PV MMU specific and it is not used on ARM at all.
> 
> Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

Looks a lot nicer now.

Acked-by: Jan Beulich <jbeulich@xxxxxxxx>

> Cc: Jan Beulich <JBeulich@xxxxxxxx>
> Cc: Keir (Xen.org) <keir@xxxxxxx>
> Cc: Tim Deegan <tim@xxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> ---
> v3: Renamed from "xen: make start_info x86 specific." and use an ifdef 
> instead
>     of moving the definition.
> ---
>  tools/libxc/xenctrl.h             |    5 ++---
>  xen/include/public/arch-x86/xen.h |    2 ++
>  xen/include/public/xen.h          |    3 ++-
>  3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
> index 32122fd..9e4a741 100644
> --- a/tools/libxc/xenctrl.h
> +++ b/tools/libxc/xenctrl.h
> @@ -395,15 +395,14 @@ typedef union
>      shared_info_t s;
>  } shared_info_any_t;
>  
> +#if defined(__i386__) || defined(__x86_64__)
>  typedef union
>  {
> -#if defined(__i386__) || defined(__x86_64__)
>      start_info_x86_64_t x64;
>      start_info_x86_32_t x32;
> -#endif
>      start_info_t s;
>  } start_info_any_t;
> -
> +#endif
>  
>  int xc_domain_create(xc_interface *xch,
>                       uint32_t ssidref,
> diff --git a/xen/include/public/arch-x86/xen.h 
> b/xen/include/public/arch-x86/xen.h
> index b7f6a51..7ae8c90 100644
> --- a/xen/include/public/arch-x86/xen.h
> +++ b/xen/include/public/arch-x86/xen.h
> @@ -70,6 +70,8 @@ typedef unsigned long xen_pfn_t;
>  #define PRI_xen_pfn "lx"
>  #endif
>  
> +#define XEN_HAVE_PV_GUEST_ENTRY 1
> +
>  /*
>   * `incontents 200 segdesc Segment Descriptor Tables
>   */
> diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
> index e9431e2..0d92b1f 100644
> --- a/xen/include/public/xen.h
> +++ b/xen/include/public/xen.h
> @@ -705,7 +705,7 @@ typedef struct shared_info shared_info_t;
>   *     bootstrap element. If necessary, the bootstrap virtual region is
>   *     extended by an extra 4MB to ensure this.
>   */
> -
> +#ifdef XEN_HAVE_PV_GUEST_ENTRY
>  #define MAX_GUEST_CMDLINE 1024
>  struct start_info {
>      /* THE FOLLOWING ARE FILLED IN BOTH ON INITIAL BOOT AND ON RESUME.    
> */
> @@ -745,6 +745,7 @@ typedef struct start_info start_info_t;
>  #define console_mfn    console.domU.mfn
>  #define console_evtchn console.domU.evtchn
>  #endif
> +#endif
>  
>  /* These flags are passed in the 'flags' field of start_info_t. */
>  #define SIF_PRIVILEGED    (1<<0)  /* Is the domain privileged? */
> -- 
> 1.7.2.5




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