[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next for-1.6 2/6] sun4m: QOM cast cleanup for AF
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next for-1.6 2/6] sun4m: QOM cast cleanup for AFXState |
Date: |
Sat, 27 Jul 2013 13:55:52 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/sparc/sun4m.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index eb3b11b..e5c6881 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -612,8 +612,12 @@ static const TypeInfo idreg_info = {
.class_init = idreg_class_init,
};
+#define TYPE_TCX_AFX "tcx_afx"
+#define TCX_AFX(obj) OBJECT_CHECK(AFXState, (obj), TYPE_TCX_AFX)
+
typedef struct AFXState {
- SysBusDevice busdev;
+ SysBusDevice parent_obj;
+
MemoryRegion mem;
} AFXState;
@@ -623,7 +627,7 @@ static void afx_init(hwaddr addr)
DeviceState *dev;
SysBusDevice *s;
- dev = qdev_create(NULL, "tcx_afx");
+ dev = qdev_create(NULL, TYPE_TCX_AFX);
qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev);
@@ -632,7 +636,7 @@ static void afx_init(hwaddr addr)
static int afx_init1(SysBusDevice *dev)
{
- AFXState *s = FROM_SYSBUS(AFXState, dev);
+ AFXState *s = TCX_AFX(dev);
memory_region_init_ram(&s->mem, OBJECT(s), "sun4m.afx", 4);
vmstate_register_ram_global(&s->mem);
@@ -648,7 +652,7 @@ static void afx_class_init(ObjectClass *klass, void *data)
}
static const TypeInfo afx_info = {
- .name = "tcx_afx",
+ .name = TYPE_TCX_AFX,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(AFXState),
.class_init = afx_class_init,
--
1.8.1.4
- [Qemu-devel] [PATCH qom-next for-1.6 0/6] sparc: QOM cast cleanups, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 2/6] sun4m: QOM cast cleanup for AFXState,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-next for-1.6 4/6] sun4m: QOM cast cleanup for RamDevice, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 1/6] sun4m: QOM cast cleanup for IDRegState, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 6/6] sun4u: QOM cast cleanup for RamDevice, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 5/6] sun4u: QOM cast cleanup for PROMState, Andreas Färber, 2013/07/27
- [Qemu-devel] [PATCH qom-next for-1.6 3/6] sun4m: QOM cast cleanup for PROMState, Andreas Färber, 2013/07/27