From 2ac711791b2e4aabc5e4046b7428727828c705eb Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Fri, 8 May 2009 02:35:15 +0100 Subject: Replace cpu_abort with hw_error Signed-off-by: Paul Brook --- hw/arm_gic.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'hw/arm_gic.c') diff --git a/hw/arm_gic.c b/hw/arm_gic.c index 8e61b6e572..2f484e191e 100644 --- a/hw/arm_gic.c +++ b/hw/arm_gic.c @@ -343,7 +343,7 @@ static uint32_t gic_dist_readb(void *opaque, target_phys_addr_t offset) } return res; bad_reg: - cpu_abort(cpu_single_env, "gic_dist_readb: Bad offset %x\n", (int)offset); + hw_error("gic_dist_readb: Bad offset %x\n", (int)offset); return 0; } @@ -505,7 +505,7 @@ static void gic_dist_writeb(void *opaque, target_phys_addr_t offset, gic_update(s); return; bad_reg: - cpu_abort(cpu_single_env, "gic_dist_writeb: Bad offset %x\n", (int)offset); + hw_error("gic_dist_writeb: Bad offset %x\n", (int)offset); } static void gic_dist_writew(void *opaque, target_phys_addr_t offset, @@ -587,8 +587,7 @@ static uint32_t gic_cpu_read(gic_state *s, int cpu, int offset) case 0x18: /* Highest Pending Interrupt */ return s->current_pending[cpu]; default: - cpu_abort(cpu_single_env, "gic_cpu_read: Bad offset %x\n", - (int)offset); + hw_error("gic_cpu_read: Bad offset %x\n", (int)offset); return 0; } } @@ -609,8 +608,7 @@ static void gic_cpu_write(gic_state *s, int cpu, int offset, uint32_t value) case 0x10: /* End Of Interrupt */ return gic_complete_irq(s, cpu, value & 0x3ff); default: - cpu_abort(cpu_single_env, "gic_cpu_write: Bad offset %x\n", - (int)offset); + hw_error("gic_cpu_write: Bad offset %x\n", (int)offset); return; } gic_update(s); -- cgit v1.2.3