diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-08-08 15:00:01 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-08-08 15:00:01 +0100 |
commit | 79202307efe0f93d58a73eb09cde2cddf3418bf5 (patch) | |
tree | 7c201c54761fd129887dfb72594220fb1d67ab5e | |
parent | c4d2da457ce1ba804b2337729943bd7c052e8775 (diff) | |
download | xen-79202307efe0f93d58a73eb09cde2cddf3418bf5.tar.gz xen-79202307efe0f93d58a73eb09cde2cddf3418bf5.tar.bz2 xen-79202307efe0f93d58a73eb09cde2cddf3418bf5.zip |
x86: also show event upcall mask when dumping guest state
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-rw-r--r-- | xen/arch/x86/x86_32/traps.c | 34 | ||||
-rw-r--r-- | xen/arch/x86/x86_64/traps.c | 34 |
2 files changed, 46 insertions, 22 deletions
diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index f99050350c..c967d0b5d7 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -32,14 +32,26 @@ static void print_xen_info(void) arch, debug, print_tainted(taint_str)); } -static void _show_registers(const struct cpu_user_regs *regs, - unsigned long crs[8], int guest_mode, - const char *context) +enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; + +static void _show_registers( + const struct cpu_user_regs *regs, unsigned long crs[8], + enum context context, const struct vcpu *v) { + const static char *context_names[] = { + [CTXT_hypervisor] = "hypervisor", + [CTXT_pv_guest] = "pv guest", + [CTXT_hvm_guest] = "hvm guest" + }; + printk("EIP: %04x:[<%08x>]", regs->cs, regs->eip); - if ( !guest_mode ) + if ( context == CTXT_hypervisor ) print_symbol(" %s", regs->eip); - printk("\nEFLAGS: %08x CONTEXT: %s\n", regs->eflags, context); + printk("\nEFLAGS: %08x ", regs->eflags); + if ( (context == CTXT_pv_guest) && v && v->vcpu_info ) + printk("EM: %d ", !!v->vcpu_info->evtchn_upcall_mask); + printk("CONTEXT: %s\n", context_names[context]); + printk("eax: %08x ebx: %08x ecx: %08x edx: %08x\n", regs->eax, regs->ebx, regs->ecx, regs->edx); printk("esi: %08x edi: %08x ebp: %08x esp: %08x\n", @@ -56,13 +68,13 @@ void show_registers(struct cpu_user_regs *regs) { struct cpu_user_regs fault_regs = *regs; unsigned long fault_crs[8]; - const char *context; + enum context context; struct vcpu *v = current; if ( is_hvm_vcpu(v) && guest_mode(regs) ) { struct segment_register sreg; - context = "hvm"; + context = CTXT_hvm_guest; fault_crs[0] = v->arch.hvm_vcpu.guest_cr[0]; fault_crs[2] = v->arch.hvm_vcpu.guest_cr[2]; fault_crs[3] = v->arch.hvm_vcpu.guest_cr[3]; @@ -84,7 +96,7 @@ void show_registers(struct cpu_user_regs *regs) { if ( !guest_mode(regs) ) { - context = "hypervisor"; + context = CTXT_hypervisor; fault_regs.esp = (unsigned long)®s->esp; fault_regs.ss = read_segment_register(ss); fault_regs.ds = read_segment_register(ds); @@ -95,7 +107,7 @@ void show_registers(struct cpu_user_regs *regs) } else { - context = "guest"; + context = CTXT_pv_guest; fault_crs[2] = v->vcpu_info->arch.cr2; } @@ -106,7 +118,7 @@ void show_registers(struct cpu_user_regs *regs) print_xen_info(); printk("CPU: %d\n", smp_processor_id()); - _show_registers(&fault_regs, fault_crs, guest_mode(regs), context); + _show_registers(&fault_regs, fault_crs, context, v); if ( this_cpu(ler_msr) && !guest_mode(regs) ) { @@ -130,7 +142,7 @@ void vcpu_show_registers(const struct vcpu *v) crs[3] = pagetable_get_paddr(v->arch.guest_table); crs[4] = v->arch.guest_context.ctrlreg[4]; - _show_registers(&v->arch.guest_context.user_regs, crs, 1, "guest"); + _show_registers(&v->arch.guest_context.user_regs, crs, CTXT_pv_guest, v); } 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 698a9b8691..a4f83a1d63 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -40,14 +40,26 @@ static void print_xen_info(void) debug, print_tainted(taint_str)); } -static void _show_registers(const struct cpu_user_regs *regs, - unsigned long crs[8], int guest_mode, - const char *context) +enum context { CTXT_hypervisor, CTXT_pv_guest, CTXT_hvm_guest }; + +static void _show_registers( + const struct cpu_user_regs *regs, unsigned long crs[8], + enum context context, const struct vcpu *v) { + const static char *context_names[] = { + [CTXT_hypervisor] = "hypervisor", + [CTXT_pv_guest] = "pv guest", + [CTXT_hvm_guest] = "hvm guest" + }; + printk("RIP: %04x:[<%016lx>]", regs->cs, regs->rip); - if ( !guest_mode ) + if ( context == CTXT_hypervisor ) print_symbol(" %s", regs->rip); - printk("\nRFLAGS: %016lx CONTEXT: %s\n", regs->rflags, context); + printk("\nRFLAGS: %016lx ", regs->rflags); + if ( (context == CTXT_pv_guest) && v && v->vcpu_info ) + printk("EM: %d ", !!vcpu_info(v, evtchn_upcall_mask)); + printk("CONTEXT: %s\n", context_names[context]); + printk("rax: %016lx rbx: %016lx rcx: %016lx\n", regs->rax, regs->rbx, regs->rcx); printk("rdx: %016lx rsi: %016lx rdi: %016lx\n", @@ -71,13 +83,13 @@ void show_registers(struct cpu_user_regs *regs) { struct cpu_user_regs fault_regs = *regs; unsigned long fault_crs[8]; - const char *context; + enum context context; struct vcpu *v = current; if ( is_hvm_vcpu(v) && guest_mode(regs) ) { struct segment_register sreg; - context = "hvm"; + context = CTXT_hvm_guest; fault_crs[0] = v->arch.hvm_vcpu.guest_cr[0]; fault_crs[2] = v->arch.hvm_vcpu.guest_cr[2]; fault_crs[3] = v->arch.hvm_vcpu.guest_cr[3]; @@ -99,12 +111,12 @@ void show_registers(struct cpu_user_regs *regs) { if ( guest_mode(regs) ) { - context = "guest"; + context = CTXT_pv_guest; fault_crs[2] = arch_get_cr2(v); } else { - context = "hypervisor"; + context = CTXT_hypervisor; fault_crs[2] = read_cr2(); } @@ -119,7 +131,7 @@ void show_registers(struct cpu_user_regs *regs) print_xen_info(); printk("CPU: %d\n", smp_processor_id()); - _show_registers(&fault_regs, fault_crs, guest_mode(regs), context); + _show_registers(&fault_regs, fault_crs, context, v); if ( this_cpu(ler_msr) && !guest_mode(regs) ) { @@ -146,7 +158,7 @@ void vcpu_show_registers(const struct vcpu *v) v->arch.guest_table_user); crs[4] = v->arch.guest_context.ctrlreg[4]; - _show_registers(regs, crs, 1, "guest"); + _show_registers(regs, crs, CTXT_pv_guest, v); } void show_page_walk(unsigned long addr) |