On Tue, Feb 04, 2020 at 11:20:38AM +0000, Wei Liu wrote:
> On Fri, Jan 31, 2020 at 05:49:21PM +0000, Wei Liu wrote:
> > Push hypervisor_ap_setup down to smp_callin.
> >
> > Take the chance to replace xen_guest with cpu_has_hypervisor.
> >
> > Signed-off-by: Wei Liu <li...@microsoft.com>
> > Reviewed-by: Roger Pau Monné <roger....@citrix.com>
> > Reviewed-by: Jan Beulich <jbeul...@suse.com>
> > ---
> > xen/arch/x86/smpboot.c | 10 +++++++---
> > 1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
> > index c9d1ab4423..93b86a09e9 100644
> > --- a/xen/arch/x86/smpboot.c
> > +++ b/xen/arch/x86/smpboot.c
> > @@ -199,6 +199,13 @@ static void smp_callin(void)
> > goto halt;
> > }
> >
> > + if ( cpu_has_hypervisor && (rc = hypervisor_ap_setup()) != 0 )
>
> In light of a comment made by Roger yesterday, with this change the
> ASSERT_UNREACHABLE in hypervisor_ap_setup() stub should be dropped, to
> deal with Xen running on a hypervisor with !CONFIG_GUEST.
>
> I have folded in the following diff:
>
> diff --git a/xen/include/asm-x86/guest/hypervisor.h
> b/xen/include/asm-x86/guest/hypervisor.h
> index b503854c5b..64383f0c3d 100644
> --- a/xen/include/asm-x86/guest/hypervisor.h
> +++ b/xen/include/asm-x86/guest/hypervisor.h
> @@ -44,7 +44,7 @@ void hypervisor_resume(void);
>
> static inline const char *hypervisor_probe(void) { return NULL; }
> static inline void hypervisor_setup(void) { ASSERT_UNREACHABLE(); }
> -static inline int hypervisor_ap_setup(void) { ASSERT_UNREACHABLE(); return
> 0; }
> +static inline int hypervisor_ap_setup(void) { return 0; }
> static inline void hypervisor_resume(void) { ASSERT_UNREACHABLE(); }
Oh, I didn't notice this one indeed. Please keep my R-b.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
