From: Wei Liu Date: Tue, 4 Sep 2018 16:15:21 +0000 (+0100) Subject: x86: monitor.o is currently HVM only X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3325 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2f092127a8ce9c2b0538d1804329f364cc9da2c;p=xen.git x86: monitor.o is currently HVM only 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 Acked-by: Razvan Cojocaru --- diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 261c598ff3..2f2ad3adfd 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 49889033f4..e02484f56b 100644 --- a/xen/include/asm-x86/monitor.h +++ b/xen/include/asm-x86/monitor.h @@ -99,10 +99,23 @@ 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 -EOPNOTSUPP; +} + +static inline void arch_monitor_cleanup_domain(struct domain *d) {} + +#endif + bool monitored_msr(const struct domain *d, u32 msr); bool monitored_msr_onchangeonly(const struct domain *d, u32 msr);