[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 110/173] lm32_sys: QOM cast cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 110/173] lm32_sys: QOM cast cleanup |
Date: |
Mon, 29 Jul 2013 21:19:27 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/misc/lm32_sys.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/misc/lm32_sys.c b/hw/misc/lm32_sys.c
index 060a5bf..9bdb781 100644
--- a/hw/misc/lm32_sys.c
+++ b/hw/misc/lm32_sys.c
@@ -44,8 +44,12 @@ enum {
#define MAX_TESTNAME_LEN 16
+#define TYPE_LM32_SYS "lm32-sys"
+#define LM32_SYS(obj) OBJECT_CHECK(LM32SysState, (obj), TYPE_LM32_SYS)
+
struct LM32SysState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion iomem;
uint32_t base;
uint32_t regs[R_MAX];
@@ -104,7 +108,7 @@ static const MemoryRegionOps sys_ops = {
static void sys_reset(DeviceState *d)
{
- LM32SysState *s = container_of(d, LM32SysState, busdev.qdev);
+ LM32SysState *s = LM32_SYS(d);
int i;
for (i = 0; i < R_MAX; i++) {
@@ -115,7 +119,7 @@ static void sys_reset(DeviceState *d)
static int lm32_sys_init(SysBusDevice *dev)
{
- LM32SysState *s = FROM_SYSBUS(typeof(*s), dev);
+ LM32SysState *s = LM32_SYS(dev);
memory_region_init_io(&s->iomem, OBJECT(dev), &sys_ops , s,
"sys", R_MAX * 4);
@@ -158,7 +162,7 @@ static void lm32_sys_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo lm32_sys_info = {
- .name = "lm32-sys",
+ .name = TYPE_LM32_SYS,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32SysState),
.class_init = lm32_sys_class_init,
--
1.8.1.4
- [Qemu-devel] [PULL 093/173] exynos4210_combiner: QOM cast cleanup, (continued)
- [Qemu-devel] [PULL 093/173] exynos4210_combiner: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 096/173] grlib_irqmp: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 094/173] exynos4210_gic: QOM cast cleanup for exynos4210.gic, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 095/173] exynos4210_gic: QOM cast cleanup for exynos4210.irq_gate, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 097/173] lm32_pic: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 105/173] arm_l2x0: Rename l2x0_state to L2x0State, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 106/173] arm_l2x0: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 107/173] arm_sysctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 108/173] eccmemctl: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 109/173] exynos4210_pmu: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 110/173] lm32_sys: QOM cast cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 112/173] milkymist-pfpu: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 111/173] milkymist-hpdmc: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 116/173] slavio_misc: QOM cast cleanup for APCState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 113/173] mst_fpga: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 115/173] slavio_misc: QOM cast cleanup for MiscState, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 114/173] puv3_pm: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 123/173] milkymist-minimac2: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 124/173] smc91c111: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 125/173] stellaris_enet: QOM cast cleanup, Andreas Färber, 2013/07/29
- [Qemu-devel] [PULL 126/173] stellaris_enet: Fix NetClientInfo::cleanup, Andreas Färber, 2013/07/29