[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 163/173] xilinx_timer: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 163/173] xilinx_timer: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:20:20 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/timer/xilinx_timer.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index ee53834..5f2c902 100644
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -57,9 +57,14 @@ struct xlx_timer
uint32_t regs[R_MAX];
};
+#define TYPE_XILINX_TIMER "xlnx.xps-timer"
+#define XILINX_TIMER(obj) \
+ OBJECT_CHECK(struct timerblock, (obj), TYPE_XILINX_TIMER)
+
struct timerblock
{
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion mmio;
qemu_irq irq;
uint8_t one_timer_only;
@@ -200,7 +205,7 @@ static void timer_hit(void *opaque)
static int xilinx_timer_init(SysBusDevice *dev)
{
- struct timerblock *t = FROM_SYSBUS(typeof (*t), dev);
+ struct timerblock *t = XILINX_TIMER(dev);
unsigned int i;
/* All timers share a single irq line. */
@@ -241,7 +246,7 @@ static void xilinx_timer_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo xilinx_timer_info = {
- .name = "xlnx.xps-timer",
+ .name = TYPE_XILINX_TIMER,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct timerblock),
.class_init = xilinx_timer_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 155/173] m48t59: QOM cast cleanup for M48t59SysBusState, (continued)
- [Qemu-devel] [PULL 155/173] m48t59: QOM cast cleanup for M48t59SysBusState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 156/173] milkymist-sysctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 157/173] pl031: Rename pl031_state to PL031State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 158/173] pl031: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 159/173] puv3_ost: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 160/173] pxa2xx_timer: QOM'ify pxa25x-timer and pxa27x-timer, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 161/173] slavio_timer: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 162/173] tusb6010: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 164/173] sysbus: Drop FROM_SYSBUS(), Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 165/173] sysbus: Remove unused sysbus_new() prototype, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 163/173] xilinx_timer: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 103/173] slavio_intctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 099/173] pl190: Rename pl190_state to PL190State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 173/173] sysbus: QOM parent field cleanup for SysBusDevice, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 169/173] kvmvapic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 168/173] mipsnet: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 118/173] cadence_gem: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 171/173] ioapic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 122/173] lance: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 170/173] kvm/ioapic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 100/173] pl190: QOM cast cleanup, Andreas Färber, 2013/07/29