# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxxxx
# Node ID f3561b1ee7a3313fb0cb62d48f7ad1f56c3c435d
# Parent 8d75d4e0af1e3ef30fc86874c10288df6ad5a76e
[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@xxxxxxxxxxxxx>
---
xen/arch/x86/traps.c | 18 ++++++++++++------
xen/arch/x86/x86_32/traps.c | 2 --
xen/arch/x86/x86_64/traps.c | 10 ++--------
xen/common/domain.c | 2 +-
xen/common/keyhandler.c | 2 +-
xen/include/asm-ia64/debugger.h | 1 +
xen/include/asm-ia64/vmx.h | 1 +
xen/include/asm-x86/hvm/support.h | 2 +-
xen/include/asm-x86/processor.h | 1 +
9 files changed, 20 insertions(+), 19 deletions(-)
diff -r 8d75d4e0af1e -r f3561b1ee7a3 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/arch/x86/traps.c Mon Jun 19 11:44:25 2006 +0100
@@ -306,6 +306,12 @@ void show_stack_overflow(unsigned long e
#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, s
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, ch
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_
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_r
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_
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(str
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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/arch/x86/x86_32/traps.c Mon Jun 19 11:44:25 2006 +0100
@@ -68,8 +68,6 @@ void show_registers(struct cpu_user_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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/arch/x86/x86_64/traps.c Mon Jun 19 11:44:25 2006 +0100
@@ -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_
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 c
/* 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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/common/domain.c
--- a/xen/common/domain.c Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/common/domain.c Mon Jun 19 11:44:25 2006 +0100
@@ -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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/common/keyhandler.c
--- a/xen/common/keyhandler.c Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/common/keyhandler.c Mon Jun 19 11:44:25 2006 +0100
@@ -90,7 +90,7 @@ static void dump_registers(unsigned char
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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/include/asm-ia64/debugger.h
--- a/xen/include/asm-ia64/debugger.h Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/include/asm-ia64/debugger.h Mon Jun 19 11:44:25 2006 +0100
@@ -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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/include/asm-ia64/vmx.h
--- a/xen/include/asm-ia64/vmx.h Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/include/asm-ia64/vmx.h Mon Jun 19 11:44:25 2006 +0100
@@ -42,6 +42,7 @@ extern void vmx_save_state(struct vcpu *
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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/include/asm-x86/hvm/support.h
--- a/xen/include/asm-x86/hvm/support.h Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/include/asm-x86/hvm/support.h Mon Jun 19 11:44:25 2006 +0100
@@ -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 -r 8d75d4e0af1e -r f3561b1ee7a3 xen/include/asm-x86/processor.h
--- a/xen/include/asm-x86/processor.h Mon Jun 19 11:21:40 2006 +0100
+++ b/xen/include/asm-x86/processor.h Mon Jun 19 11:44:25 2006 +0100
@@ -531,6 +531,7 @@ void show_stack(struct cpu_user_regs *re
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);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home