[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 06/15] timer/arm_mptimer: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH RFC 06/15] timer/arm_mptimer: QOM cast cleanup |
Date: |
Sun, 30 Jun 2013 23:00:56 +0200 |
From: Andreas Färber <address@hidden>
Introduce type constant and cast macro and rename
ARMMPTimerState::busdev to enforce its use.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/timer/arm_mptimer.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 317f5e4..588e34b 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -40,8 +40,15 @@ typedef struct {
MemoryRegion iomem;
} TimerBlock;
+#define TYPE_ARM_MP_TIMER "arm_mptimer"
+#define ARM_MP_TIMER(obj) \
+ OBJECT_CHECK(ARMMPTimerState, (obj), TYPE_ARM_MP_TIMER)
+
typedef struct {
- SysBusDevice busdev;
+ /*< private >*/
+ SysBusDevice parent_obj;
+ /*< public >*/
+
uint32_t num_cpu;
TimerBlock timerblock[MAX_CPUS];
MemoryRegion iomem;
@@ -211,9 +218,9 @@ static void timerblock_reset(TimerBlock *tb)
static void arm_mptimer_reset(DeviceState *dev)
{
- ARMMPTimerState *s =
- FROM_SYSBUS(ARMMPTimerState, SYS_BUS_DEVICE(dev));
+ ARMMPTimerState *s = ARM_MP_TIMER(dev);
int i;
+
for (i = 0; i < ARRAY_SIZE(s->timerblock); i++) {
timerblock_reset(&s->timerblock[i]);
}
@@ -221,8 +228,9 @@ static void arm_mptimer_reset(DeviceState *dev)
static int arm_mptimer_init(SysBusDevice *dev)
{
- ARMMPTimerState *s = FROM_SYSBUS(ARMMPTimerState, dev);
+ ARMMPTimerState *s = ARM_MP_TIMER(dev);
int i;
+
if (s->num_cpu < 1 || s->num_cpu > MAX_CPUS) {
hw_error("%s: num-cpu must be between 1 and %d\n", __func__, MAX_CPUS);
}
@@ -295,7 +303,7 @@ static void arm_mptimer_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo arm_mptimer_info = {
- .name = "arm_mptimer",
+ .name = TYPE_ARM_MP_TIMER,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ARMMPTimerState),
.class_init = arm_mptimer_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH RFC 00/15] arm: A9MPCore+A15MPCore QOM'ification, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 02/15] cpu/a9mpcore: Split off instance_init, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 03/15] cpu/a9mpcore: Embed GICState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 01/15] cpu/a9mpcore: QOM casting cleanup, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 05/15] cpu/a9mpcore: Embed A9SCUState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 04/15] misc/a9scu: QOM cleanups, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 07/15] timer/arm_mptimer: Convert to QOM realize, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 06/15] timer/arm_mptimer: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PATCH RFC 10/15] cpu/a9mpcore: Prepare for QOM embedding, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 09/15] cpu/a9mpcore: Convert to QOM realize, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 08/15] cpu/a9mpcore: Embed ARMMPTimerState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 11/15] cpu/a15mpcore: QOM cast cleanup, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 12/15] cpu/a15mpcore: Split off instance_init, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 13/15] cpu/a15mpcore: Embed GICState, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 14/15] cpu/a15mpcore: Convert to QOM realize, Andreas Färber, 2013/06/30
- [Qemu-devel] [PATCH RFC 15/15] cpu/a15mpcore: Prepare for QOM embedding, Andreas Färber, 2013/06/30