From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 6 Feb 2018 16:29:59 +0000 (+0100)
Subject: x86/NMI: invert condition in nmi_show_execution_state()
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~625
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=309e0509b7363a895362fcbeac823562c3e18def;p=xen.git

x86/NMI: invert condition in nmi_show_execution_state()

We want to decode the symbol when _not_ in guest mode.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 1187fd9c25..2e022b09b8 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -632,7 +632,7 @@ static int nmi_show_execution_state(const struct cpu_user_regs *regs, int cpu)
         show_execution_state(regs);
     else
         printk(XENLOG_ERR "CPU%d @ %04x:%08lx (%pS)\n", cpu, regs->cs,
-               regs->rip, guest_mode(regs) ? _p(regs->rip) : NULL);
+               regs->rip, guest_mode(regs) ? NULL : _p(regs->rip));
     cpumask_clear_cpu(cpu, &show_state_mask);
 
     return 1;