From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH V2 08/40] arm: print domid as part of debug trap Date: Tue, 26 Jun 2012 10:29:32 +0000 Message-ID: <1340706604-1313-8-git-send-email-ian.campbell@citrix.com> References: <1340706574.3832.57.camel@zakaz.uk.xensource.com> <1340706604-1313-1-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1340706604-1313-1-git-send-email-ian.campbell@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/traps.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 5d8b7f9..40bb375 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -388,25 +388,26 @@ static arm_hypercall_t *arm_hypercall_table[] = { static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code) { uint32_t reg, *r; - + uint32_t domid = current->domain->domain_id; switch ( code ) { case 0xe0 ... 0xef: reg = code - 0xe0; r = ®s->r0 + reg; - printk("R%d = %#010"PRIx32" at %#010"PRIx32"\n", reg, *r, regs->pc); + printk("DOM%d: R%d = %#010"PRIx32" at %#010"PRIx32"\n", + domid, reg, *r, regs->pc); break; case 0xfd: - printk("Reached %08"PRIx32"\n", regs->pc); + printk("DOM%d: Reached %#010"PRIx32"\n", domid, regs->pc); break; case 0xfe: printk("%c", (char)(regs->r0 & 0xff)); break; case 0xff: - printk("DEBUG\n"); + printk("DOM%d: DEBUG\n", domid); show_execution_state(regs); break; default: - panic("Unhandled debug trap %#x\n", code); + panic("DOM%d: Unhandled debug trap %#x\n", domid, code); break; } } -- 1.7.9.1