| Message ID | 20170823155824.11144-2-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 23.08.17 at 17:58, <wei.liu2@citrix.com> wrote: > Arm should always set it, while on x86 xen can't build with it set to > 0, which means people haven't used it for years. > > Remove it and simplify xen/paging.h. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> This is something I certainly would want Tim to see (and perhaps approve). Jan > --- > Cc: Jan Beulich <jbeulich@suse.com> > Cc: Andrew Cooper <andrew.cooper3@citrix.com> > Cc: Stefano Stabellini <sstabellini@kernel.org> > Cc: Julien Grall <julien.grall@arm.com> > --- > xen/include/asm-arm/config.h | 2 -- > xen/include/asm-x86/config.h | 1 - > xen/include/xen/paging.h | 19 ------------------- > 3 files changed, 22 deletions(-) > > diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h > index 7da94698e1..210c9f858b 100644 > --- a/xen/include/asm-arm/config.h > +++ b/xen/include/asm-arm/config.h > @@ -24,8 +24,6 @@ > /* xen_ulong_t is always 64 bits */ > #define BITS_PER_XEN_ULONG 64 > > -#define CONFIG_PAGING_ASSISTANCE 1 > - > #define CONFIG_PAGING_LEVELS 3 > > #define CONFIG_ARM 1 > diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h > index 0130ac864f..f63a9cb952 100644 > --- a/xen/include/asm-x86/config.h > +++ b/xen/include/asm-x86/config.h > @@ -19,7 +19,6 @@ > > #define BITS_PER_XEN_ULONG BITS_PER_LONG > > -#define CONFIG_PAGING_ASSISTANCE 1 > #define CONFIG_X86_PM_TIMER 1 > #define CONFIG_HPET_TIMER 1 > #define CONFIG_X86_MCE_THERMAL 1 > diff --git a/xen/include/xen/paging.h b/xen/include/xen/paging.h > index 214bde5576..a126c9bf58 100644 > --- a/xen/include/xen/paging.h > +++ b/xen/include/xen/paging.h > @@ -1,26 +1,7 @@ > - > #ifndef __XEN_PAGING_H__ > #define __XEN_PAGING_H__ > > -#if defined CONFIG_PAGING_ASSISTANCE > - > #include <asm/paging.h> > #include <asm/p2m.h> > > -#elif defined CONFIG_SHADOW_PAGING > - > -#include <asm/shadow.h> > - > -#define paging_mode_translate(d) shadow_mode_translate(d) > -#define paging_mode_external(d) (0) > - > -#else > - > -#define paging_mode_translate(d) (0) > -#define paging_mode_external(d) (0) > -#define guest_physmap_add_page(d, p, m, o) ((void)0) > -#define guest_physmap_remove_page(d, p, m, o) ((void)0) > - > -#endif > - > #endif /* __XEN_PAGING_H__ */ > -- > 2.11.0
At 10:04 -0600 on 23 Aug (1503482672), Jan Beulich wrote: > >>> On 23.08.17 at 17:58, <wei.liu2@citrix.com> wrote: > > Arm should always set it, while on x86 xen can't build with it set to > > 0, which means people haven't used it for years. > > > > Remove it and simplify xen/paging.h. > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > This is something I certainly would want Tim to see (and perhaps > approve). Thanks. I see and approve. :) Acked-by: Tim Deegan <tim@xen.org>
>>> On 24.08.17 at 12:04, <tim@xen.org> wrote: > At 10:04 -0600 on 23 Aug (1503482672), Jan Beulich wrote: >> >>> On 23.08.17 at 17:58, <wei.liu2@citrix.com> wrote: >> > Arm should always set it, while on x86 xen can't build with it set to >> > 0, which means people haven't used it for years. >> > >> > Remove it and simplify xen/paging.h. >> > >> > Signed-off-by: Wei Liu <wei.liu2@citrix.com> >> >> This is something I certainly would want Tim to see (and perhaps >> approve). > > Thanks. I see and approve. :) > > Acked-by: Tim Deegan <tim@xen.org> Thanks, in which case both patches can have my ack too (in case it's still needed at all). Jan
Hi, On 23/08/17 16:58, Wei Liu wrote: > Arm should always set it, while on x86 xen can't build with it set to > 0, which means people haven't used it for years. > > Remove it and simplify xen/paging.h. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> Arm bits: Acked-by: Julien Grall <julien.grall@arm.com> Cheers,
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 7da94698e1..210c9f858b 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -24,8 +24,6 @@ /* xen_ulong_t is always 64 bits */ #define BITS_PER_XEN_ULONG 64 -#define CONFIG_PAGING_ASSISTANCE 1 - #define CONFIG_PAGING_LEVELS 3 #define CONFIG_ARM 1 diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 0130ac864f..f63a9cb952 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -19,7 +19,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG -#define CONFIG_PAGING_ASSISTANCE 1 #define CONFIG_X86_PM_TIMER 1 #define CONFIG_HPET_TIMER 1 #define CONFIG_X86_MCE_THERMAL 1 diff --git a/xen/include/xen/paging.h b/xen/include/xen/paging.h index 214bde5576..a126c9bf58 100644 --- a/xen/include/xen/paging.h +++ b/xen/include/xen/paging.h @@ -1,26 +1,7 @@ - #ifndef __XEN_PAGING_H__ #define __XEN_PAGING_H__ -#if defined CONFIG_PAGING_ASSISTANCE - #include <asm/paging.h> #include <asm/p2m.h> -#elif defined CONFIG_SHADOW_PAGING - -#include <asm/shadow.h> - -#define paging_mode_translate(d) shadow_mode_translate(d) -#define paging_mode_external(d) (0) - -#else - -#define paging_mode_translate(d) (0) -#define paging_mode_external(d) (0) -#define guest_physmap_add_page(d, p, m, o) ((void)0) -#define guest_physmap_remove_page(d, p, m, o) ((void)0) - -#endif - #endif /* __XEN_PAGING_H__ */
Arm should always set it, while on x86 xen can't build with it set to 0, which means people haven't used it for years. Remove it and simplify xen/paging.h. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Julien Grall <julien.grall@arm.com> --- xen/include/asm-arm/config.h | 2 -- xen/include/asm-x86/config.h | 1 - xen/include/xen/paging.h | 19 ------------------- 3 files changed, 22 deletions(-)