diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-07-26 21:59:04 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-29 21:06:58 +0200 |
| commit | 816d323be3e66b82cd92657c783c0e5e7b88d6d9 (patch) | |
| tree | 5b1783238221d592c54c3d47d8e93b264677726d /hw/misc/lm32_sys.c | |
| parent | b6e1df2e91fbf89226605a9459bc86c2aa0a404e (diff) | |
| download | qemu-816d323be3e66b82cd92657c783c0e5e7b88d6d9.zip qemu-816d323be3e66b82cd92657c783c0e5e7b88d6d9.tar.gz qemu-816d323be3e66b82cd92657c783c0e5e7b88d6d9.tar.bz2 | |
lm32_sys: QOM cast cleanup
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/misc/lm32_sys.c')
| -rw-r--r-- | hw/misc/lm32_sys.c | 12 |
1 files 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, |