[Xen-devel] [PATCH] xen/x86: Fix CONFIG_CRASH_DEBUG build following c/s 897129dea

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

Found by a Travis RANDCONFIG run.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Elena Ufimtseva <elena.ufimtseva@xxxxxxxxxx>
---
 xen/arch/x86/gdbstub.c        | 8 ++++----
 xen/arch/x86/x86_64/gdbstub.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/gdbstub.c b/xen/arch/x86/gdbstub.c
index 2a39189..fe69f81 100644
--- a/xen/arch/x86/gdbstub.c
+++ b/xen/arch/x86/gdbstub.c
@@ -66,16 +66,16 @@ gdb_arch_resume(struct cpu_user_regs *regs,
                 struct gdb_context *ctx)
 {
     if ( addr != -1UL )
-        regs->eip = addr;
+        regs->rip = addr;
 
-    regs->eflags &= ~X86_EFLAGS_TF;
+    regs->_eflags &= ~X86_EFLAGS_TF;
 
     /* Set eflags.RF to ensure we do not re-enter. */
-    regs->eflags |= X86_EFLAGS_RF;
+    regs->_eflags |= X86_EFLAGS_RF;
 
     /* Set the trap flag if we are single stepping. */
     if ( type == GDB_STEP )
-        regs->eflags |= X86_EFLAGS_TF;
+        regs->_eflags |= X86_EFLAGS_TF;
 }
 
 /*
diff --git a/xen/arch/x86/x86_64/gdbstub.c b/xen/arch/x86/x86_64/gdbstub.c
index 2626519..2c2ab15 100644
--- a/xen/arch/x86/x86_64/gdbstub.c
+++ b/xen/arch/x86/x86_64/gdbstub.c
@@ -44,7 +44,7 @@ gdb_arch_read_reg_array(struct cpu_user_regs *regs, struct 
gdb_context *ctx)
     GDB_REG64(regs->r15);
 
     GDB_REG64(regs->rip);
-    GDB_REG32(regs->eflags);
+    GDB_REG32(regs->_eflags);
 
     GDB_REG32(regs->cs);
     GDB_REG32(regs->ss);
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel