From: Andreas Färber Date: Fri, 26 Jul 2013 21:21:50 +0000 (+0200) Subject: slavio_misc: QOM cast cleanup for APCState X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1499^2~57 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1a0a79f4faeac50ea490496e92d00d7260d9437;p=sdk%2Femulator%2Fqemu.git slavio_misc: QOM cast cleanup for APCState Signed-off-by: Andreas Färber --- diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index 1b93a01..767544e 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -57,8 +57,12 @@ typedef struct MiscState { uint16_t leds; } MiscState; +#define TYPE_APC "apc" +#define APC(obj) OBJECT_CHECK(APCState, (obj), TYPE_APC) + typedef struct APCState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq cpu_halt; } APCState; @@ -411,7 +415,7 @@ static const VMStateDescription vmstate_misc = { static int apc_init1(SysBusDevice *dev) { - APCState *s = FROM_SYSBUS(APCState, dev); + APCState *s = APC(dev); sysbus_init_irq(dev, &s->cpu_halt); @@ -498,7 +502,7 @@ static void apc_class_init(ObjectClass *klass, void *data) } static const TypeInfo apc_info = { - .name = "apc", + .name = TYPE_APC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MiscState), .class_init = apc_class_init,