[Xen-changelog] [xen master] x86: stub out PV only code in do_debug

[p***@xen.org]

commit d7ccb75b9623e8cca4fec718539c32412a3b8b6d
Author: Wei Liu <***@citrix.com>
AuthorDate: Fri Oct 19 15:28:38 2018 +0100
Commit: Wei Liu <***@citrix.com>
CommitDate: Sat Oct 20 12:31:48 2018 +0100

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 <***@citrix.com>
Acked-by: Andrew Cooper <***@citrix.com>
---
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();
--
generated by git-patchbot for /home/xen/git/xen.git#master