[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 v2 20/20] wdt_ib700: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.5 v2 20/20] wdt_ib700: QOM'ify |
Date: |
Sat, 27 Apr 2013 22:18:55 +0200 |
Introduce type constant and cast macro to obsolete DO_UPCAST().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/watchdog/wdt_ib700.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index b8c4be8..6b8e33a 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,
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.5 v2 09/20] ne2000-isa: QOM'ify, (continued)
- [Qemu-devel] [PATCH for-1.5 v2 09/20] ne2000-isa: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 11/20] pc: QOM'ify port 92, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 12/20] pckbd: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 13/20] pcspk: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 14/20] sb16: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 15/20] serial: QOM'ify ISA serial, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 16/20] sga: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 17/20] vga-isa: QOM'ify ISA VGA, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 18/20] vmmouse: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 19/20] vmport: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 20/20] wdt_ib700: QOM'ify,
Andreas Färber <=
- Re: [Qemu-devel] [PATCH for-1.5 v2 00/20] QOM realize for ISA, part 1, Anthony Liguori, 2013/04/29