From d7ccb75b9623e8cca4fec718539c32412a3b8b6d Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 19 Oct 2018 15:28:38 +0100 Subject: [PATCH] x86: stub out PV only code in do_debug When PV is disabled those symbols won't be available. It is impossible for Xen to hit #DB there. Signed-off-by: Wei Liu Acked-by: Andrew Cooper --- xen/arch/x86/traps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3988753682..f834ae2b31 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1822,6 +1822,7 @@ void do_debug(struct cpu_user_regs *regs) if ( regs->eflags & X86_EFLAGS_TF ) { +#ifdef CONFIG_PV /* In SYSENTER entry path we can't zap TF until EFLAGS is saved. */ if ( (regs->rip >= (unsigned long)sysenter_entry) && (regs->rip <= (unsigned long)sysenter_eflags_saved) ) @@ -1830,6 +1831,7 @@ void do_debug(struct cpu_user_regs *regs) regs->eflags &= ~X86_EFLAGS_TF; return; } +#endif if ( !debugger_trap_fatal(TRAP_debug, regs) ) { WARN(); -- 2.30.2