diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-04-27 22:18:55 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-29 08:27:50 -0500 |
| commit | 61e477f4c731c4ff3f1a44dbfc55c8a5903c8d52 (patch) | |
| tree | 5f188f4b0f4c0b3223caf357e5d5a8575dbe1b07 /hw/watchdog | |
| parent | f02317ad4eca65a9a79b474b6d2d77ba87a57185 (diff) | |
wdt_ib700: QOM'ify
Introduce type constant and cast macro to obsolete DO_UPCAST().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367093935-29091-21-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/watchdog')
| -rw-r--r-- | hw/watchdog/wdt_ib700.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index b8c4be85ff..6b8e33a286 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -35,8 +35,12 @@ #define ib700_debug(fs,...) #endif +#define TYPE_IB700 "ib700" +#define IB700(obj) OBJECT_CHECK(IB700State, (obj), TYPE_IB700) + typedef struct IB700state { - ISADevice dev; + ISADevice parent_obj; + QEMUTimer *timer; } IB700State; @@ -95,7 +99,7 @@ static const VMStateDescription vmstate_ib700 = { static int wdt_ib700_init(ISADevice *dev) { - IB700State *s = DO_UPCAST(IB700State, dev, dev); + IB700State *s = IB700(dev); ib700_debug("watchdog init\n"); @@ -108,7 +112,7 @@ static int wdt_ib700_init(ISADevice *dev) static void wdt_ib700_reset(DeviceState *dev) { - IB700State *s = DO_UPCAST(IB700State, dev.qdev, dev); + IB700State *s = IB700(dev); ib700_debug("watchdog reset\n"); @@ -130,7 +134,7 @@ static void wdt_ib700_class_init(ObjectClass *klass, void *data) } static const TypeInfo wdt_ib700_info = { - .name = "ib700", + .name = TYPE_IB700, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(IB700State), .class_init = wdt_ib700_class_init, |