aboutsummaryrefslogtreecommitdiff
path: root/hw/pl031.c
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-08 02:35:15 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-08 02:35:15 +0100
commit2ac711791b2e4aabc5e4046b7428727828c705eb (patch)
treec4ed47028dee4949cc7eace9760a20d1759406e2 /hw/pl031.c
parente612a1f7256bb3546cf3e9ae6cad3997c4153663 (diff)
downloadqemu-2ac711791b2e4aabc5e4046b7428727828c705eb.zip
qemu-2ac711791b2e4aabc5e4046b7428727828c705eb.tar.gz
qemu-2ac711791b2e4aabc5e4046b7428727828c705eb.tar.bz2
Replace cpu_abort with hw_error
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/pl031.c')
-rw-r--r--hw/pl031.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/pl031.c b/hw/pl031.c
index 8c62995..3f8bfaa 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -119,8 +119,7 @@ static uint32_t pl031_read(void *opaque, target_phys_addr_t offset)
(int)offset);
break;
default:
- cpu_abort(cpu_single_env, "pl031_read: Bad offset 0x%x\n",
- (int)offset);
+ hw_error("pl031_read: Bad offset 0x%x\n", (int)offset);
break;
}
@@ -168,8 +167,7 @@ static void pl031_write(void * opaque, target_phys_addr_t offset,
break;
default:
- cpu_abort(cpu_single_env, "pl031_write: Bad offset 0x%x\n",
- (int)offset);
+ hw_error("pl031_write: Bad offset 0x%x\n", (int)offset);
break;
}
}
@@ -195,8 +193,9 @@ void pl031_init(uint32_t base, qemu_irq irq)
s = qemu_mallocz(sizeof(pl031_state));
iomemtype = cpu_register_io_memory(0, pl031_readfn, pl031_writefn, s);
- if (iomemtype == -1)
- cpu_abort(cpu_single_env, "pl031_init: Can't register I/O memory\n");
+ if (iomemtype == -1) {
+ hw_error("pl031_init: Can't register I/O memory\n");
+ }
cpu_register_physical_memory(base, 0x00001000, iomemtype);