Re: [PATCH v2 12/23] x86: monitor.o is currently HVM only

[Razvan Cojocaru <rcojocaru@bitdefender.com>]

On 8/26/18 3:19 PM, Wei Liu wrote:
> There has been plan to make PV work, but it is not yet there.  Provide
> stubs to make it build with !CONFIG_HVM.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
>  xen/arch/x86/Makefile         |  2 +-
>  xen/include/asm-x86/monitor.h | 14 ++++++++++++++
>  2 files changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
> index 9b9b63a..43f9189 100644
> --- a/xen/arch/x86/Makefile
> +++ b/xen/arch/x86/Makefile
> @@ -45,7 +45,7 @@ obj-y += microcode_amd.o
>  obj-y += microcode_intel.o
>  obj-y += microcode.o
>  obj-y += mm.o x86_64/mm.o
> -obj-y += monitor.o
> +obj-$(CONFIG_HVM) += monitor.o
>  obj-y += mpparse.o
>  obj-y += nmi.o
>  obj-y += numa.o
> diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h
> index 4988903..09f7f8a 100644
> --- a/xen/include/asm-x86/monitor.h
> +++ b/xen/include/asm-x86/monitor.h
> @@ -99,10 +99,24 @@ static inline uint32_t arch_monitor_get_capabilities(struct domain *d)
>  int arch_monitor_domctl_event(struct domain *d,
>                                struct xen_domctl_monitor_op *mop);
>  
> +#ifdef CONFIG_HVM
> +
>  int arch_monitor_init_domain(struct domain *d);
>  
>  void arch_monitor_cleanup_domain(struct domain *d);
>  
> +#else
> +
> +static inline int arch_monitor_init_domain(struct domain *d)
> +{
> +    return 0;

Right, if vm_event is not supported for anything other than HVM then we
should return -ENOENT or a similar error here. That way, at least the
user knows things will not work upfront (when trying to enable vm_event).

> +}
> +
> +static inline void arch_monitor_cleanup_domain(struct domain *d)
> +{}

I'm not sure if this is valid coding style (as opposed to having a
newline before '}'.


Thanks,
Razvan

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