[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] hw/arm_timer: Use LOG_GUEST_ERROR and LOG_UNI
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 08/12] hw/arm_timer: Use LOG_GUEST_ERROR and LOG_UNIMP |
Date: |
Thu, 25 Oct 2012 13:57:43 +0100 |
Use LOG_GUEST_ERROR to report guest accesses to bad register
offsets, and LOG_UNIMP for access to the unimplemented
test registers.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm_timer.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index 2e13621..af339d3 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -64,7 +64,8 @@ static uint32_t arm_timer_read(void *opaque, hwaddr offset)
return 0;
return s->int_level;
default:
- hw_error("%s: Bad offset %x\n", __func__, (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Bad offset %x\n", __func__, (int)offset);
return 0;
}
}
@@ -131,7 +132,8 @@ static void arm_timer_write(void *opaque, hwaddr offset,
arm_timer_recalibrate(s, 0);
break;
default:
- hw_error("%s: Bad offset %x\n", __func__, (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Bad offset %x\n", __func__, (int)offset);
}
arm_timer_update(s);
}
@@ -223,10 +225,14 @@ static uint64_t sp804_read(void *opaque, hwaddr offset,
/* Integration Test control registers, which we won't support */
case 0xf00: /* TimerITCR */
case 0xf04: /* TimerITOP (strictly write only but..) */
+ qemu_log_mask(LOG_UNIMP,
+ "%s: integration test registers unimplemented\n",
+ __func__);
return 0;
}
- hw_error("%s: Bad offset %x\n", __func__, (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "%s: Bad offset %x\n", __func__, (int)offset);
return 0;
}
@@ -246,7 +252,8 @@ static void sp804_write(void *opaque, hwaddr offset,
}
/* Technically we could be writing to the Test Registers, but not likely */
- hw_error("%s: Bad offset %x\n", __func__, (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset %x\n",
+ __func__, (int)offset);
}
static const MemoryRegionOps sp804_ops = {
@@ -300,7 +307,7 @@ static uint64_t icp_pit_read(void *opaque, hwaddr offset,
/* ??? Don't know the PrimeCell ID for this device. */
n = offset >> 8;
if (n > 2) {
- hw_error("%s: Bad timer %d\n", __func__, n);
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad timer %d\n", __func__, n);
}
return arm_timer_read(s->timer[n], offset & 0xff);
@@ -314,7 +321,7 @@ static void icp_pit_write(void *opaque, hwaddr offset,
n = offset >> 8;
if (n > 2) {
- hw_error("%s: Bad timer %d\n", __func__, n);
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad timer %d\n", __func__, n);
}
arm_timer_write(s->timer[n], offset & 0xff, value);
--
1.7.9.5
- [Qemu-devel] [PATCH 00/12] use LOG_GUEST_ERROR in more ARM devices, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 03/12] hw/pl080: Use LOG_GUEST_ERROR and LOG_UNIMP, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 05/12] hw/pl190: Use LOG_UNIMP rather than hw_error(), Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 11/12] hw/arm_l2x0: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 09/12] hw/armv7m_nvic: Use LOG_GUEST_ERROR and LOG_UNIMP, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 08/12] hw/arm_timer: Use LOG_GUEST_ERROR and LOG_UNIMP,
Peter Maydell <=
- [Qemu-devel] [PATCH 01/12] hw/pl050: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 12/12] hw/versatile_i2c: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 10/12] hw/arm_sysctl: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 06/12] hw/arm11mpcore: Use LOG_GUEST_ERROR rather than hw_error(), Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 07/12] hw/arm_gic: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 04/12] hw/pl110: Use LOG_GUEST_ERROR rather than hw_error(), Peter Maydell, 2012/10/25
- [Qemu-devel] [PATCH 02/12] hw/pl061: Use LOG_GUEST_ERROR, Peter Maydell, 2012/10/25