diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-06-09 22:47:34 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-07-01 01:11:15 +0200 |
| commit | 43f691e9e248edca7b70680fd87b5be786cc4e01 (patch) | |
| tree | 49f31d98b13d9ab60547a8629962ea64a8586df2 | |
| parent | 1f1a83f459dab7fbec9c5866a4d6a1ae16549edd (diff) | |
mpc8544_guts: QOM'ify
Introduce type constant, cast macro and rename parent field.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/ppc/mpc8544_guts.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index 98540a4514..f623b040c9 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -51,8 +51,14 @@ #define MPC8544_GUTS_ADDR_SRDS2CR1 0xF10 #define MPC8544_GUTS_ADDR_SRDS2CR3 0xF18 +#define TYPE_MPC8544_GUTS "mpc8544-guts" +#define MPC8544_GUTS(obj) OBJECT_CHECK(GutsState, (obj), TYPE_MPC8544_GUTS) + struct GutsState { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; }; @@ -110,9 +116,7 @@ static const MemoryRegionOps mpc8544_guts_ops = { static int mpc8544_guts_initfn(SysBusDevice *dev) { - GutsState *s; - - s = FROM_SYSBUS(GutsState, SYS_BUS_DEVICE(dev)); + GutsState *s = MPC8544_GUTS(dev); memory_region_init_io(&s->iomem, &mpc8544_guts_ops, s, "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE); @@ -129,7 +133,7 @@ static void mpc8544_guts_class_init(ObjectClass *klass, void *data) } static const TypeInfo mpc8544_guts_info = { - .name = "mpc8544-guts", + .name = TYPE_MPC8544_GUTS, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(GutsState), .class_init = mpc8544_guts_class_init, |