Re: [Xen-devel] [PATCH for-next v2 8/9] x86: be more verbose when running on a hypervisor

[Wei Liu <wl@xxxxxxx>]

On Mon, Oct 21, 2019 at 12:00:38PM +0200, Roger Pau Monné wrote:
> On Mon, Sep 30, 2019 at 04:00:42PM +0100, Wei Liu wrote:
> > Signed-off-by: Wei Liu <liuwe@xxxxxxxxxxxxx>
> > ---
> >  xen/arch/x86/guest/hypervisor.c        | 5 +++++
> >  xen/arch/x86/setup.c                   | 6 +++++-
> >  xen/include/asm-x86/guest/hypervisor.h | 2 ++
> >  3 files changed, 12 insertions(+), 1 deletion(-)
> > 
> > diff --git a/xen/arch/x86/guest/hypervisor.c 
> > b/xen/arch/x86/guest/hypervisor.c
> > index 30453b6a7a..8161b26c5a 100644
> > --- a/xen/arch/x86/guest/hypervisor.c
> > +++ b/xen/arch/x86/guest/hypervisor.c
> > @@ -43,6 +43,11 @@ bool hypervisor_probe(void)
> >      return !!hops;
> >  }
> >  
> > +const char *hypervisor_name(void)
> > +{
> 
> I would maybe add ASSERT(hops);
> 
> > +    return hops->name;
> > +}
> > +
[...]
> > diff --git a/xen/include/asm-x86/guest/hypervisor.h 
> > b/xen/include/asm-x86/guest/hypervisor.h
> > index 38344e2e89..a7d75bf9cf 100644
> > --- a/xen/include/asm-x86/guest/hypervisor.h
> > +++ b/xen/include/asm-x86/guest/hypervisor.h
> > @@ -36,6 +36,7 @@ bool hypervisor_probe(void);
> >  void hypervisor_setup(void);
> >  void hypervisor_ap_setup(void);
> >  void hypervisor_resume(void);
> > +const char *hypervisor_name(void);
> >  
> >  #else
> >  
> > @@ -45,6 +46,7 @@ static inline bool hypervisor_probe(void) { return false; 
> > }
> >  static inline void hypervisor_setup(void) {}
> >  static inline void hypervisor_ap_setup(void) {}
> >  static inline void hypervisor_resume(void) {}
> > +static inline char *hypervisor_name(void) { return NULL; }
> 
> I think you want an ASSERT_UNREACHABLE here, since hypervisor_name
> shouldn't be called unless Xen has detected that's running as a guest,
> which can only happen if CONFIG_GUEST is selected.

Ack to both comments.

Wei.

> 
> Thanks, Roger.

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