[Xen-changelog] Fix show_registers() show guest stack or Xen stack, not both.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1503, 2005/05/21 11:41:06+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix show_registers() show guest stack or Xen stack, not both.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 x86_32/traps.c |    3 ++-
 x86_64/traps.c |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)


diff -Nru a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c       2005-05-22 13:04:04 -04:00
+++ b/xen/arch/x86/x86_32/traps.c       2005-05-22 13:04:04 -04:00
@@ -78,9 +78,10 @@
            "ss: %04lx   cs: %04lx\n",
            ds, es, fs, gs, ss, cs);
 
-    show_stack((unsigned long *)&regs->esp);
     if ( GUEST_MODE(regs) )
         show_guest_stack();
+    else
+        show_stack((unsigned long *)&regs->esp);
 } 
 
 void show_page_walk(unsigned long addr)
diff -Nru a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c       2005-05-22 13:04:04 -04:00
+++ b/xen/arch/x86/x86_64/traps.c       2005-05-22 13:04:04 -04:00
@@ -23,10 +23,11 @@
     printk("r12: %016lx   r13: %016lx   r14: %016lx   r15: %016lx\n",
            regs->r12, regs->r13, regs->r14, regs->r15);
 
-    show_stack((unsigned long *)regs->rsp);
     if ( GUEST_MODE(regs) )
         show_guest_stack();
-} 
+    else
+        show_stack((unsigned long *)regs->rsp);
+}
 
 void show_page_walk(unsigned long addr)
 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog