[XEN] Rename show_registers() to show_execution_state().

This makes more sense since it dumps stack as well as
registers. show_registers() still exists; it simply doesn't
dump the stack any more.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index c3eb12f8478901e5cbe9f8d8d5c97325a0df908d..199ad50b726d2e3dbfa709f223a91fa145610b9a 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -306,6 +306,12 @@ void show_stack_overflow(unsigned long esp)
 #endif
 }
 
+void show_execution_state(struct cpu_user_regs *regs)
+{
+    show_registers(regs);
+    show_stack(regs);
+}
+
 /*
  * This is called for faults at very unexpected times (e.g., when interrupts
  * are disabled). In such situations we can't do much that is safe. We try to
@@ -327,7 +333,7 @@ asmlinkage void fatal_trap(int trapnr, struct cpu_user_regs *regs)
     watchdog_disable();
     console_start_sync();
 
-    show_registers(regs);
+    show_execution_state(regs);
 
     if ( trapnr == TRAP_page_fault )
     {
@@ -390,7 +396,7 @@ static inline int do_trap(int trapnr, char *str,
 
     DEBUGGER_trap_fatal(trapnr, regs);
 
-    show_registers(regs);
+    show_execution_state(regs);
     panic("CPU%d FATAL TRAP: vector = %d (%s)\n"
           "[error_code=%04x]\n",
           smp_processor_id(), trapnr, str, regs->error_code);
@@ -482,7 +488,7 @@ asmlinkage int do_invalid_op(struct cpu_user_regs *regs)
     if ( unlikely(!guest_mode(regs)) )
     {
         DEBUGGER_trap_fatal(TRAP_invalid_op, regs);
-        show_registers(regs);
+        show_execution_state(regs);
         panic("CPU%d FATAL TRAP: vector = %d (invalid opcode)\n",
               smp_processor_id(), TRAP_invalid_op);
     }
@@ -511,7 +517,7 @@ asmlinkage int do_int3(struct cpu_user_regs *regs)
     if ( !guest_mode(regs) )
     {
         DEBUGGER_trap_fatal(TRAP_int3, regs);
-        show_registers(regs);
+        show_execution_state(regs);
         panic("CPU%d FATAL TRAP: vector = 3 (Int3)\n", smp_processor_id());
     } 
 
@@ -791,7 +797,7 @@ asmlinkage int do_page_fault(struct cpu_user_regs *regs)
 
         DEBUGGER_trap_fatal(TRAP_page_fault, regs);
 
-        show_registers(regs);
+        show_execution_state(regs);
         show_page_walk(addr);
         panic("CPU%d FATAL PAGE FAULT\n"
               "[error_code=%04x]\n"
@@ -1356,7 +1362,7 @@ asmlinkage int do_general_protection(struct cpu_user_regs *regs)
     DEBUGGER_trap_fatal(TRAP_gp_fault, regs);
 
  hardware_gp:
-    show_registers(regs);
+    show_execution_state(regs);
     panic("CPU%d GENERAL PROTECTION FAULT\n[error_code=%04x]\n",
           smp_processor_id(), regs->error_code);
     return 0;

diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c
index d6afff2ab4244ad2b69d53b16d4353e07ac4e37d..8a4cd31a078d60cd7ed4de639260d73bc02ca2e0 100644 (file)
--- a/xen/arch/x86/x86_32/traps.c
+++ b/xen/arch/x86/x86_32/traps.c
@@ -68,8 +68,6 @@ void show_registers(struct cpu_user_regs *regs)
            "ss: %04x   cs: %04x\n",
            fault_regs.ds, fault_regs.es, fault_regs.fs,
            fault_regs.gs, fault_regs.ss, fault_regs.cs);
-
-    show_stack(regs);
 }
 
 void show_page_walk(unsigned long addr)

diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index 3e416542f1b61d7c49de27d01ca77f60e6d41627..bbc4d075b982e32fd078d5af430444bcf0ed217e 100644 (file)
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -21,7 +21,7 @@
 
 #include <public/callback.h>
 
-static void __show_registers(struct cpu_user_regs *regs)
+void show_registers(struct cpu_user_regs *regs)
 {
     struct cpu_user_regs fault_regs = *regs;
     unsigned long fault_crs[8];
@@ -70,12 +70,6 @@ static void __show_registers(struct cpu_user_regs *regs)
            fault_regs.gs, fault_regs.ss, fault_regs.cs);
 }
 
-void show_registers(struct cpu_user_regs *regs)
-{
-    __show_registers(regs);
-    show_stack(regs);
-}
-
 void show_page_walk(unsigned long addr)
 {
     unsigned long pfn, mfn = read_cr3() >> PAGE_SHIFT;
@@ -128,7 +122,7 @@ asmlinkage void do_double_fault(struct cpu_user_regs *regs)
 
     /* Find information saved during fault and dump it to the console. */
     printk("************************************\n");
-    __show_registers(regs);
+    show_registers(regs);
     show_stack_overflow(regs->rsp);
     printk("************************************\n");
     printk("CPU%d DOUBLE FAULT -- system shutdown\n", smp_processor_id());

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 48a2b32162ee88a4173ee06b2144d731ec4b53be..89d5b793b4ea4aa84bad55cbfa4a9663930b528f 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -234,7 +234,7 @@ void __domain_crash(struct domain *d)
     {
         printk("Domain %d (vcpu#%d) crashed on cpu#%d:\n",
                d->domain_id, current->vcpu_id, smp_processor_id());
-        show_registers(guest_cpu_user_regs());
+        show_execution_state(guest_cpu_user_regs());
     }
     else
     {

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 433efcd6ee4e9136ed7d49caa6dde06853d87ff7..aea0f1a78715e399c66f1ea3df11beebf3d0edf8 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -90,7 +90,7 @@ static void show_handlers(unsigned char key)
 static void dump_registers(unsigned char key, struct cpu_user_regs *regs)
 {
     printk("'%c' pressed -> dumping registers\n", key); 
-    show_registers(regs); 
+    show_execution_state(regs); 
 }
 
 static void halt_machine(unsigned char key, struct cpu_user_regs *regs)

diff --git a/xen/include/asm-ia64/debugger.h b/xen/include/asm-ia64/debugger.h
index 2b895cb1c76c6ed42b590ba0d133738ae580ca6a..d242f21b881fb105f6ad781e69c2d354fdab9f1c 100644 (file)
--- a/xen/include/asm-ia64/debugger.h
+++ b/xen/include/asm-ia64/debugger.h
@@ -41,6 +41,7 @@
 #include <xen/gdbstub.h>
 
 void show_registers(struct cpu_user_regs *regs);
+#define show_execution_state show_registers
 
 // NOTE: on xen struct pt_regs = struct cpu_user_regs
 //       see include/asm-ia64/linux-xen/asm/ptrace.h

diff --git a/xen/include/asm-ia64/vmx.h b/xen/include/asm-ia64/vmx.h
index e25e471225a3c279f3c9e4befdf81c2cbd178373..5ebe44d81417970855fb7261e0905511b10c6535 100644 (file)
--- a/xen/include/asm-ia64/vmx.h
+++ b/xen/include/asm-ia64/vmx.h
@@ -42,6 +42,7 @@ extern int ia64_hypercall (struct pt_regs *regs);
 extern void vmx_save_state(struct vcpu *v);
 extern void vmx_load_state(struct vcpu *v);
 extern void show_registers(struct pt_regs *regs);
+#define show_execution_state show_registers
 extern int vmx_build_physmap_table(struct domain *d);
 extern unsigned long __gpfn_to_mfn_foreign(struct domain *d, unsigned long gpfn);
 extern void sync_split_caches(void);

diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h
index 088da65167e2e930f57d151d6ffc477fac7885a0..61ad981399b2e550f4272ceb136ecb2b7ce255da 100644 (file)
--- a/xen/include/asm-x86/hvm/support.h
+++ b/xen/include/asm-x86/hvm/support.h
@@ -132,7 +132,7 @@ extern unsigned int opt_hvm_debug_level;
 #define  __hvm_bug(regs)                                        \
     do {                                                        \
         printk("__hvm_bug at %s:%d\n", __FILE__, __LINE__);     \
-        show_registers(regs);                                   \
+        show_execution_state(regs);                             \
         domain_crash_synchronous();                             \
     } while (0)
 

diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h
index 79c683d6ffee2b9b7fd99f4f11ce75f8d59fe57f..75d0772fef8446c685ec4e800917abf48237317a 100644 (file)
--- a/xen/include/asm-x86/processor.h
+++ b/xen/include/asm-x86/processor.h
@@ -531,6 +531,7 @@ extern always_inline void prefetchw(const void *x)
 void show_stack(struct cpu_user_regs *regs);
 void show_stack_overflow(unsigned long esp);
 void show_registers(struct cpu_user_regs *regs);
+void show_execution_state(struct cpu_user_regs *regs);
 void show_page_walk(unsigned long addr);
 asmlinkage void fatal_trap(int trapnr, struct cpu_user_regs *regs);