[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] hw/pl181: Use LOG_UNIMP and LOG_GUEST_ERROR
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 2/7] hw/pl181: Use LOG_UNIMP and LOG_GUEST_ERROR |
Date: |
Sun, 14 Oct 2012 14:11:11 +0100 |
Rather than a mix of direct printing to stderr and aborting
via hw_error(), use LOG_UNIMP and LOG_GUEST_ERROR.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/pl181.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/hw/pl181.c b/hw/pl181.c
index 7d91fbb..23fc063 100644
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -10,6 +10,7 @@
#include "blockdev.h"
#include "sysbus.h"
#include "sd.h"
+#include "qemu-log.h"
//#define DEBUG_PL181 1
@@ -352,7 +353,7 @@ static uint64_t pl181_read(void *opaque, target_phys_addr_t
offset,
case 0xa0: case 0xa4: case 0xa8: case 0xac:
case 0xb0: case 0xb4: case 0xb8: case 0xbc:
if (s->fifo_len == 0) {
- fprintf(stderr, "pl181: Unexpected FIFO read\n");
+ qemu_log_mask(LOG_GUEST_ERROR, "pl181: Unexpected FIFO read\n");
return 0;
} else {
uint32_t value;
@@ -363,7 +364,8 @@ static uint64_t pl181_read(void *opaque, target_phys_addr_t
offset,
return value;
}
default:
- hw_error("pl181_read: Bad offset %x\n", (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "pl181_read: Bad offset %x\n", (int)offset);
return 0;
}
}
@@ -387,11 +389,11 @@ static void pl181_write(void *opaque, target_phys_addr_t
offset,
s->cmd = value;
if (s->cmd & PL181_CMD_ENABLE) {
if (s->cmd & PL181_CMD_INTERRUPT) {
- fprintf(stderr, "pl181: Interrupt mode not implemented\n");
- abort();
+ qemu_log_mask(LOG_UNIMP,
+ "pl181: Interrupt mode not implemented\n");
} if (s->cmd & PL181_CMD_PENDING) {
- fprintf(stderr, "pl181: Pending commands not implemented\n");
- abort();
+ qemu_log_mask(LOG_UNIMP,
+ "pl181: Pending commands not implemented\n");
} else {
pl181_send_command(s);
pl181_fifo_run(s);
@@ -427,14 +429,15 @@ static void pl181_write(void *opaque, target_phys_addr_t
offset,
case 0xa0: case 0xa4: case 0xa8: case 0xac:
case 0xb0: case 0xb4: case 0xb8: case 0xbc:
if (s->datacnt == 0) {
- fprintf(stderr, "pl181: Unexpected FIFO write\n");
+ qemu_log_mask(LOG_GUEST_ERROR, "pl181: Unexpected FIFO write\n");
} else {
pl181_fifo_push(s, value);
pl181_fifo_run(s);
}
break;
default:
- hw_error("pl181_write: Bad offset %x\n", (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "pl181_write: Bad offset %x\n", (int)offset);
}
pl181_update(s);
}
--
1.7.11.4
- [Qemu-devel] [PATCH 0/7] Add LOG_GUEST_ERROR for reporting guest bugs, Peter Maydell, 2012/10/14
- [Qemu-devel] [PATCH 6/7] hw/pl022: Use LOG_UNIMP and LOG_GUEST_ERROR, Peter Maydell, 2012/10/14
- [Qemu-devel] [PATCH 5/7] hw/pl011: Use LOG_UNIMP and LOG_GUEST_ERROR, Peter Maydell, 2012/10/14
- [Qemu-devel] [PATCH 3/7] hw/pl041: Use LOG_UNIMP, Peter Maydell, 2012/10/14
- [Qemu-devel] [PATCH 2/7] hw/pl181: Use LOG_UNIMP and LOG_GUEST_ERROR,
Peter Maydell <=
- [Qemu-devel] [PATCH 7/7] hw/pl031: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/14
- [Qemu-devel] [PATCH 4/7] hw/pl190: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/14
- [Qemu-devel] [PATCH 1/7] qemu-log: Add new log category for guest bugs, Peter Maydell, 2012/10/14
- Re: [Qemu-devel] [PATCH 0/7] Add LOG_GUEST_ERROR for reporting guest bugs, Blue Swirl, 2012/10/14